@@ -744,7 +744,7 @@ discard block |
||
744 | 744 | $hookmanager->initHooks(array('accountancyBindingCalculation')); |
745 | 745 | |
746 | 746 | // Execute hook accountancyBindingCalculation |
747 | - $parameters = array('buyer' => $buyer, 'seller' => $seller, 'product' => $product, 'facture' => $facture, 'factureDet' => $factureDet ,'accountingAccount' => $accountingAccount, 0 => $type); |
|
747 | + $parameters = array('buyer' => $buyer, 'seller' => $seller, 'product' => $product, 'facture' => $facture, 'factureDet' => $factureDet, 'accountingAccount' => $accountingAccount, 0 => $type); |
|
748 | 748 | $reshook = $hookmanager->executeHooks('accountancyBindingCalculation', $parameters); // Note that $action and $object may have been modified by some hooks |
749 | 749 | |
750 | 750 | if (empty($reshook)) { |
@@ -758,9 +758,9 @@ discard block |
||
758 | 758 | require_once constant('DOL_DOCUMENT_ROOT') . '/core/lib/company.lib.php'; |
759 | 759 | $isBuyerInEEC = isInEEC($buyer); |
760 | 760 | $isSellerInEEC = isInEEC($seller); |
761 | - $code_l = ''; // Default value for generic product/service |
|
762 | - $code_p = ''; // Value for the product/service in parameter ($product) |
|
763 | - $code_t = ''; // Default value of product account for the thirdparty |
|
761 | + $code_l = ''; // Default value for generic product/service |
|
762 | + $code_p = ''; // Value for the product/service in parameter ($product) |
|
763 | + $code_t = ''; // Default value of product account for the thirdparty |
|
764 | 764 | $suggestedid = ''; |
765 | 765 | |
766 | 766 | // Level 1 (define $code_l): Search suggested default account for product/service |
@@ -613,12 +613,12 @@ discard block |
||
613 | 613 | } |
614 | 614 | } else { // $type == 'csv' |
615 | 615 | $blocks[] = array( |
616 | - $depreciation_date, // Date |
|
617 | - $element_static->ref, // Piece |
|
618 | - $account_infos['code_formatted_1'], // AccountAccounting |
|
619 | - $element_name_formatted_0 . ' - ' . $depreciation_ref, // LabelOperation |
|
620 | - $mt < 0 ? price(-$mt) : '', // Debit |
|
621 | - $mt >= 0 ? price($mt) : '', // Credit |
|
616 | + $depreciation_date, // Date |
|
617 | + $element_static->ref, // Piece |
|
618 | + $account_infos['code_formatted_1'], // AccountAccounting |
|
619 | + $element_name_formatted_0 . ' - ' . $depreciation_ref, // LabelOperation |
|
620 | + $mt < 0 ? price(-$mt) : '', // Debit |
|
621 | + $mt >= 0 ? price($mt) : '', // Credit |
|
622 | 622 | ); |
623 | 623 | } |
624 | 624 | } |
@@ -734,12 +734,12 @@ discard block |
||
734 | 734 | } |
735 | 735 | } else { // $type == 'csv' |
736 | 736 | $blocks[] = array( |
737 | - $disposal_date, // Date |
|
738 | - $element_static->ref, // Piece |
|
739 | - $account_infos['code_formatted_1'], // AccountAccounting |
|
737 | + $disposal_date, // Date |
|
738 | + $element_static->ref, // Piece |
|
739 | + $account_infos['code_formatted_1'], // AccountAccounting |
|
740 | 740 | $element_name_formatted_0 . ' - ' . $disposal_ref, // LabelOperation |
741 | - $mt < 0 ? price(-$mt) : '', // Debit |
|
742 | - $mt >= 0 ? price($mt) : '', // Credit |
|
741 | + $mt < 0 ? price(-$mt) : '', // Debit |
|
742 | + $mt >= 0 ? price($mt) : '', // Credit |
|
743 | 743 | ); |
744 | 744 | } |
745 | 745 | } |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | $changeaccount = GETPOST('changeaccount'); |
50 | 50 | // Search Getpost |
51 | 51 | $search_societe = GETPOST('search_societe', 'alpha'); |
52 | -$search_lineid = GETPOST('search_lineid', 'alpha'); // Can be '> 100' |
|
52 | +$search_lineid = GETPOST('search_lineid', 'alpha'); // Can be '> 100' |
|
53 | 53 | $search_ref = GETPOST('search_ref', 'alpha'); |
54 | 54 | $search_invoice = GETPOST('search_invoice', 'alpha'); |
55 | 55 | //$search_ref_supplier = GETPOST('search_ref_supplier', 'alpha'); |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | $search_date_endday = GETPOSTINT('search_date_endday'); |
65 | 65 | $search_date_endmonth = GETPOSTINT('search_date_endmonth'); |
66 | 66 | $search_date_endyear = GETPOSTINT('search_date_endyear'); |
67 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
67 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
68 | 68 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
69 | 69 | $search_country = GETPOST('search_country', 'aZ09'); |
70 | 70 | $search_tvaintra = GETPOST('search_tvaintra', 'alpha'); |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | $mesCasesCochees = GETPOST('toselect', 'array'); |
59 | 59 | |
60 | 60 | // Search Getpost |
61 | -$search_lineid = GETPOST('search_lineid', 'alpha'); // Can be '> 100' |
|
61 | +$search_lineid = GETPOST('search_lineid', 'alpha'); // Can be '> 100' |
|
62 | 62 | $search_societe = GETPOST('search_societe', 'alpha'); |
63 | 63 | $search_ref = GETPOST('search_ref', 'alpha'); |
64 | 64 | $search_ref_supplier = GETPOST('search_ref_supplier', 'alpha'); |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | $search_date_endday = GETPOSTINT('search_date_endday'); |
75 | 75 | $search_date_endmonth = GETPOSTINT('search_date_endmonth'); |
76 | 76 | $search_date_endyear = GETPOSTINT('search_date_endyear'); |
77 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
77 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
78 | 78 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
79 | 79 | $search_country = GETPOST('search_country', 'aZ09'); |
80 | 80 | $search_tvaintra = GETPOST('search_tvaintra', 'alpha'); |
@@ -585,7 +585,7 @@ discard block |
||
585 | 585 | $thirdpartystatic->email = $objp->email; |
586 | 586 | $thirdpartystatic->country_code = $objp->country_code; |
587 | 587 | $thirdpartystatic->tva_intra = $objp->tva_intra; |
588 | - $thirdpartystatic->code_compta_product = $objp->company_code_buy; // The accounting account for product stored on thirdparty object (for level3 suggestion) |
|
588 | + $thirdpartystatic->code_compta_product = $objp->company_code_buy; // The accounting account for product stored on thirdparty object (for level3 suggestion) |
|
589 | 589 | |
590 | 590 | $product_static->ref = $objp->product_ref; |
591 | 591 | $product_static->id = $objp->product_id; |
@@ -201,7 +201,7 @@ |
||
201 | 201 | $thirdpartystatic->email = $objp->email; |
202 | 202 | $thirdpartystatic->country_code = $objp->country_code; |
203 | 203 | $thirdpartystatic->tva_intra = $objp->tva_intra; |
204 | - $thirdpartystatic->code_compta_product = $objp->company_code_buy; // The accounting account for product stored on thirdparty object (for level3 suggestion) |
|
204 | + $thirdpartystatic->code_compta_product = $objp->company_code_buy; // The accounting account for product stored on thirdparty object (for level3 suggestion) |
|
205 | 205 | |
206 | 206 | $product_static->ref = $objp->product_ref; |
207 | 207 | $product_static->id = $objp->product_id; |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | if (empty($action) && $file_manager) { |
54 | 54 | $action = 'file_manager'; |
55 | 55 | } |
56 | -$pageid = GETPOSTINT('pageid'); |
|
56 | +$pageid = GETPOSTINT('pageid'); |
|
57 | 57 | |
58 | 58 | $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; |
59 | 59 | $sortfield = GETPOST('sortfield', 'aZ09comma'); |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | if ($sortorder) { |
120 | 120 | $backtopage .= '&sortorder=' . urlencode($sortorder); |
121 | 121 | } |
122 | -include DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php'; // This manage 'sendit', 'confirm_deletefile', 'renamefile' action when submitting new file. |
|
122 | +include DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php'; // This manage 'sendit', 'confirm_deletefile', 'renamefile' action when submitting new file. |
|
123 | 123 | |
124 | 124 | $backtopage = $savbacktopage; |
125 | 125 |
@@ -163,16 +163,16 @@ |
||
163 | 163 | 'label' => array('type' => 'varchar(128)', 'label' => 'Label', 'enabled' => 1, 'position' => 30, 'notnull' => 0, 'visible' => -1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "contains hash of file content"), |
164 | 164 | 'share' => array('type' => 'varchar(128)', 'label' => 'Share', 'enabled' => 1, 'position' => 40, 'notnull' => 0, 'visible' => -1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "contains hash for file sharing"), |
165 | 165 | 'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 50, 'index' => 1), |
166 | - 'filepath' => array('type' => 'varchar(255)', 'label' => 'FilePath', 'enabled' => 1, 'position' => 60, 'notnull' => 0, 'visible' => 0, 'searchall' => 0, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "relative to dolibarr document dir. Example module/def"), |
|
167 | - 'filename' => array('type' => 'varchar(255)', 'label' => 'FileName', 'enabled' => 1, 'position' => 70, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "file name only without any directory"), |
|
168 | - 'src_object_type' => array('type' => 'varchar(64)', 'label' => 'SourceType', 'enabled' => 1, 'position' => 80, 'notnull' => 0, 'visible' => 0, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "Source object type ('proposal', 'invoice', ...)"), |
|
166 | + 'filepath' => array('type' => 'varchar(255)', 'label' => 'FilePath', 'enabled' => 1, 'position' => 60, 'notnull' => 0, 'visible' => 0, 'searchall' => 0, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "relative to dolibarr document dir. Example module/def"), |
|
167 | + 'filename' => array('type' => 'varchar(255)', 'label' => 'FileName', 'enabled' => 1, 'position' => 70, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "file name only without any directory"), |
|
168 | + 'src_object_type' => array('type' => 'varchar(64)', 'label' => 'SourceType', 'enabled' => 1, 'position' => 80, 'notnull' => 0, 'visible' => 0, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "Source object type ('proposal', 'invoice', ...)"), |
|
169 | 169 | 'src_object_id' => array('type' => 'integer', 'label' => 'SourceID', 'default' => '1', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 90, 'index' => 1, 'comment' => "Source object id"), |
170 | - 'fullpath_orig' => array('type' => 'varchar(750)', 'label' => 'FullPathOrig', 'enabled' => 1, 'position' => 100, 'notnull' => 0, 'visible' => 0, 'searchall' => 0, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "full path of original filename, when file is uploaded from a local computer"), |
|
170 | + 'fullpath_orig' => array('type' => 'varchar(750)', 'label' => 'FullPathOrig', 'enabled' => 1, 'position' => 100, 'notnull' => 0, 'visible' => 0, 'searchall' => 0, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "full path of original filename, when file is uploaded from a local computer"), |
|
171 | 171 | 'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'visible' => 0, 'position' => 110), |
172 | - 'keywords' => array('type' => 'varchar(750)', 'label' => 'Keywords', 'enabled' => 1, 'position' => 120, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "list of keywords, separated with comma. Must be limited to most important keywords."), |
|
172 | + 'keywords' => array('type' => 'varchar(750)', 'label' => 'Keywords', 'enabled' => 1, 'position' => 120, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "list of keywords, separated with comma. Must be limited to most important keywords."), |
|
173 | 173 | 'cover' => array('type' => 'text', 'label' => 'Cover', 'enabled' => 1, 'visible' => 0, 'position' => 130, 'comment' => "is this file a file to use for a cover"), |
174 | 174 | 'position' => array('type' => 'integer', 'label' => 'Position', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 140, 'index' => 1, 'comment' => "position of file among others"), |
175 | - 'gen_or_uploaded' => array('type' => 'varchar(12)', 'label' => 'GenOrUpload', 'enabled' => 1, 'position' => 150, 'notnull' => 0, 'visible' => -1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "'generated' or 'uploaded'"), |
|
175 | + 'gen_or_uploaded' => array('type' => 'varchar(12)', 'label' => 'GenOrUpload', 'enabled' => 1, 'position' => 150, 'notnull' => 0, 'visible' => -1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "'generated' or 'uploaded'"), |
|
176 | 176 | 'extraparams' => array('type' => 'varchar(255)', 'label' => 'ExtraParams', 'enabled' => 1, 'position' => 160, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "for stocking other parameters with json format"), |
177 | 177 | 'date_c' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 170), |
178 | 178 | 'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 175), |
@@ -24,7 +24,7 @@ |
||
24 | 24 | * \brief Main page for ECM section area |
25 | 25 | */ |
26 | 26 | |
27 | -if (! defined('DISABLE_JS_GRAHP')) { |
|
27 | +if (!defined('DISABLE_JS_GRAHP')) { |
|
28 | 28 | define('DISABLE_JS_GRAPH', 1); |
29 | 29 | } |
30 | 30 |
@@ -1140,7 +1140,7 @@ |
||
1140 | 1140 | print '<input type="hidden" name="action" value="addintocategory">'; |
1141 | 1141 | print '<table class="noborder centpercent">'; |
1142 | 1142 | print '<tr class="liste_titre"><td>'; |
1143 | - $force_entity = getEntity($object->element); // So we will get same filter than the getObjectsInCateg() |
|
1143 | + $force_entity = getEntity($object->element); // So we will get same filter than the getObjectsInCateg() |
|
1144 | 1144 | print img_picto('', $type, 'class="pictofixedwidth"'); |
1145 | 1145 | print $form->select_dolusers('', 'elemid', 1, null, 0, '', '', $force_entity); |
1146 | 1146 | print '<input type="submit" class="button buttongen" value="' . $langs->trans("ClassifyInCategory") . '"></td>'; |