Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	build/generate_filelist_xml.php
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/compta/facture/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/modulebuilder.lib.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/supplier_proposal/card.php
	htdocs/ticket/list.php
This commit is contained in:
Laurent Destailleur
2021-03-02 15:27:20 +01:00
parent 5af8e49c86 495c61c231
commit 42329b10c9
23 changed files with 103 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dev/initdemo/updatedemo.php
View File

@@ -88,7 +88,8 @@ $tables=array(
'commande_fournisseur'=>array(0=>'date_commande', 1=>'date_valid', 3=>'date_creation', 4=>'date_approve', 5=>'date_approve2', 6=>'date_livraison'),
'supplier_proposal'=>array(0=>'datec', 1=>'date_valid', 2=>'date_cloture'),
'expensereport'=>array(0=>'date_debut', 1=>'date_fin', 2=>'date_create', 3=>'date_valid', 4=>'date_approve', 5=>'date_refuse', 6=>'date_cancel'),
'holiday'=>array(0=>'date_debut', 1=>'date_fin', 2=>'date_create', 3=>'date_valid', 5=>'date_refuse', 6=>'date_cancel')
'holiday'=>array(0=>'date_debut', 1=>'date_fin', 2=>'date_create', 3=>'date_valid', 5=>'date_refuse', 6=>'date_cancel'),
'ticket'=>array(0=>'datec', 1=>'date_read', 2=>'date_close')
);
$year=2010;