|
@@ -181,7 +181,7 @@ discard block |
|
|
block discarded – undo |
|
181
|
181
|
'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers, 'position'=>55), |
|
182
|
182
|
'c.date_commande'=>array('label'=>"OrderDateShort", 'checked'=>1, 'position'=>60, 'csslist'=>'nowraponall'), |
|
183
|
183
|
'c.date_delivery'=>array('label'=>"DateDeliveryPlanned", 'checked'=>1, 'enabled'=>!getDolGlobalString('ORDER_DISABLE_DELIVERY_DATE'), 'position'=>65, 'csslist'=>'nowraponall'), |
|
184
|
|
- 'c.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>-1, 'position'=>66 , 'enabled'=>isModEnabled("expedition")), |
|
|
184
|
+ 'c.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>-1, 'position'=>66, 'enabled'=>isModEnabled("expedition")), |
|
185
|
185
|
'c.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>-1, 'position'=>67), |
|
186
|
186
|
'c.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>-1, 'position'=>68), |
|
187
|
187
|
'c.fk_input_reason'=>array('label'=>"Channel", 'checked'=>-1, 'position'=>69), |
|
@@ -204,7 +204,7 @@ discard block |
|
|
block discarded – undo |
|
204
|
204
|
'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>130), |
|
205
|
205
|
'c.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES')), 'position'=>135), |
|
206
|
206
|
'c.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES')), 'position'=>140), |
|
207
|
|
- 'shippable'=>array('label'=>"Shippable", 'checked'=>1,'enabled'=>(isModEnabled("expedition")), 'position'=>990), |
|
|
207
|
+ 'shippable'=>array('label'=>"Shippable", 'checked'=>1, 'enabled'=>(isModEnabled("expedition")), 'position'=>990), |
|
208
|
208
|
'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'enabled'=>(!getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT')), 'position'=>995), |
|
209
|
209
|
'c.import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>999), |
|
210
|
210
|
'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000) |
|
@@ -322,8 +322,8 @@ discard block |
|
|
block discarded – undo |
|
322
|
322
|
} |
|
323
|
323
|
$uploaddir = $conf->commande->multidir_output[$conf->entity]; |
|
324
|
324
|
$triggersendname = 'ORDER_SENTBYMAIL'; |
|
325
|
|
- $year=""; |
|
326
|
|
- $month=""; |
|
|
325
|
+ $year = ""; |
|
|
326
|
+ $month = ""; |
|
327
|
327
|
include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; |
|
328
|
328
|
|
|
329
|
329
|
if ($massaction == 'confirm_createbills') { // Create bills from orders. |
|
@@ -338,7 +338,7 @@ discard block |
|
|
block discarded – undo |
|
338
|
338
|
$TFactThirdNbLines = array(); |
|
339
|
339
|
|
|
340
|
340
|
$nb_bills_created = 0; |
|
341
|
|
- $lastid= 0; |
|
|
341
|
+ $lastid = 0; |
|
342
|
342
|
$lastref = ''; |
|
343
|
343
|
|
|
344
|
344
|
$db->begin(); |
|
@@ -1036,7 +1036,7 @@ discard block |
|
|
block discarded – undo |
|
1036
|
1036
|
if ($searchCategoryProductOperator == 0) { |
|
1037
|
1037
|
$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."commandedet as cd WHERE cd.fk_commande = c.rowid AND cd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")"; |
|
1038
|
1038
|
} else { |
|
1039
|
|
- $listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct); |
|
|
1039
|
+ $listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct); |
|
1040
|
1040
|
} |
|
1041
|
1041
|
} |
|
1042
|
1042
|
} |
|
@@ -2602,13 +2602,13 @@ discard block |
|
|
block discarded – undo |
|
2602
|
2602
|
print '<td class="center">'; |
|
2603
|
2603
|
if (!empty($show_shippable_command) && isModEnabled('stock')) { |
|
2604
|
2604
|
if (($obj->fk_statut > $generic_commande::STATUS_DRAFT) && ($obj->fk_statut < $generic_commande::STATUS_CLOSED)) { |
|
2605
|
|
- $generic_commande->getLinesArray(); // Load array ->lines |
|
2606
|
|
- $generic_commande->loadExpeditions(); // Load array ->expeditions |
|
|
2605
|
+ $generic_commande->getLinesArray(); // Load array ->lines |
|
|
2606
|
+ $generic_commande->loadExpeditions(); // Load array ->expeditions |
|
2607
|
2607
|
|
|
2608
|
2608
|
$numlines = count($generic_commande->lines); // Loop on each line of order |
|
2609
|
2609
|
for ($lig = 0; $lig < $numlines; $lig++) { |
|
2610
|
2610
|
if (isset($generic_commande->expeditions[$generic_commande->lines[$lig]->id])) { |
|
2611
|
|
- $reliquat = $generic_commande->lines[$lig]->qty - $generic_commande->expeditions[$generic_commande->lines[$lig]->id]; |
|
|
2611
|
+ $reliquat = $generic_commande->lines[$lig]->qty - $generic_commande->expeditions[$generic_commande->lines[$lig]->id]; |
|
2612
|
2612
|
} else { |
|
2613
|
2613
|
$reliquat = $generic_commande->lines[$lig]->qty; |
|
2614
|
2614
|
} |