Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-08 18:12:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

NEW billing on shipment+reception. Can be done before or after delivery.

Browse Source
This commit is contained in:
Laurent Destailleur
2023-09-03 21:38:11 +02:00
parent 3675ec0b42
commit 3343a47244
15 changed files with 138 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/admin/workflow.php
View File

@@ -153,20 +153,40 @@ $workflowcodes = array(
),
// Automatic classification shipping
/* Replaced by next option
'WORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE' => array(
'family' => 'classify_shipping',
'position' => 90,
'enabled' => isModEnabled("expedition") && isModEnabled("facture"),
'picto' => 'shipment',
'deprecated' => 1
),
*/
'WORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE' => array(
'family' => 'classify_shipping',
'position' => 91,
'enabled' => isModEnabled("expedition") && isModEnabled("facture") && getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT') !== '0',
'picto' => 'shipment'
),
// Automatic classification reception
'WORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE'=>array(
/*
'WORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE'=>array(
'family'=>'classify_reception',
'position'=>95,
'enabled'=>(isModEnabled("reception") && (isModEnabled("supplier_order") || isModEnabled("supplier_invoice"))),
'picto'=>'reception'
),
*/
'WORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE' => array(
'family' => 'classify_reception',
'position' => 91,
'enabled' => isModEnabled("reception") && isModEnabled("supplier_invoice") && getDolGlobalString('WORKFLOW_BILL_ON_RECEPTION') !== '0',
'picto' => 'shipment'
),
'separator2'=>array('family'=>'separator', 'position'=>400, 'enabled' => (isModEnabled('ticket') && isModEnabled('contract'))),
@@ -284,6 +304,9 @@ foreach ($workflowcodes as $key => $params) {
if (!empty($params['warning'])) {
print ' '.img_warning($langs->transnoentitiesnoconv($params['warning']));
}
if (!empty($params['deprecated'])) {
print ' '.img_warning($langs->transnoentitiesnoconv("Deprecated"));
}
print '</td>';