Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
91,381 Commits 36 Branches 189 Tags
61bca50fa62c0b51127e5802e3926f031afb9812
Commit Graph

3995 Commits

Author SHA1 Message Date
Alexandre SPANGARO
61bca50fa6 NEW: Dictionary for availability - Add column position 2020-11-05 16:56:28 +01:00
Laurent Destailleur
c399721345 Update doc 2020-11-05 09:16:51 +01:00
Laurent Destailleur
e0ed89c514 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/compta/facture/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/product/class/product.class.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
 2020-11-01 17:58:41 +01:00
Laurent Destailleur
49ccf2a3cb Update doc 2020-11-01 15:55:51 +01:00
Laurent Destailleur
19b82047f0 Fix sql 2020-10-27 10:00:35 +01:00
Laurent Destailleur
07729ec431 Merge pull request #15150 from FHenry/dev_fix_migration_livraison_to_delivery 
fix migration livraison to delivery
 2020-10-26 19:28:59 +01:00
Laurent Destailleur
0abce469e9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-26 19:09:08 +01:00
Laurent Destailleur
f18a13b2d4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/product/class/productcustomerprice.class.php
 2020-10-26 19:08:11 +01:00
Laurent Destailleur
3ee618d736 FIX Clean orphan records in llx_ecm_files into repair script. 2020-10-26 18:31:12 +01:00
Florian HENRY
949be12e19 fix migration livraison to delivery 2020-10-25 17:26:15 +01:00
Laurent Destailleur
8578a7cd7c Fix regressions 2020-10-25 17:02:25 +01:00
Laurent Destailleur
cd4d738a56 Merge branch 'translateModLivraison2ModDelivery' of 
https://github.com/orebd/dolibarr into develop

# Conflicts:
#	htdocs/install/mysql/migration/12.0.0-13.0.0.sql
 2020-10-25 16:01:18 +01:00
Drosis Nikos
6ea9befb48 Add & Update tva for Greece 2020-10-16 15:20:12 +03:00
Laurent Destailleur
64b1a31e45 Merge pull request #15018 from FHenry/dev_add_dict_NatureOfProductType 
NEW : Nature of product is now a dictionay
 2020-10-15 21:07:42 +02:00
Laurent Destailleur
a1913995df Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-15 21:05:00 +02:00
Laurent Destailleur
e7992131ec Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
 2020-10-15 21:00:49 +02:00
Laurent Destailleur
6277422115 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-15 20:38:32 +02:00
Florian HENRY
a0d1e96bfd fix table creation for intracom and change reserved name column name 2020-10-15 11:37:44 +02:00
Florian HENRY
0597768ea8 fix review 2020-10-15 08:28:38 +02:00
Florian HENRY
50a9bd368c review 2020-10-14 18:15:48 +02:00
Florian HENRY
940d478aec UI and db OK 2020-10-14 15:54:48 +02:00
Florian HENRY
77de8c242c commit add table 2020-10-14 12:24:35 +02:00
Laurent Destailleur
805fa00422 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-13 15:09:24 +02:00
Laurent Destailleur
035325152f Fix migration 2020-10-13 15:02:05 +02:00
Aurélien
abfcb73a45 FIX unkwown columm tms #14947 2020-10-13 12:10:06 +02:00
Laurent Destailleur
726fd1b631 Merge pull request #11227 from aspangaro/10.0_intracommreport 
NEW module Intracomm report
 2020-10-12 13:35:58 +02:00
Laurent Destailleur
45e2a6409e Missing field 2020-10-12 11:30:53 +02:00
Laurent Destailleur
b36b9170b2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-10 15:45:22 +02:00
Laurent Destailleur
437eead694 Fix bad permission 2020-10-10 15:45:04 +02:00
Alexandre SPANGARO
8876457b54 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-10-10 06:47:05 +02:00
Francis Appels
4fb83a0dd6 Fix migration 2020-10-09 15:35:09 +02:00
Alexandre SPANGARO
ca7ad35342 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-10-09 06:39:42 +02:00
Aurélien
3daf530a92 Revert "update dependencies migration12->13.sql #14697" 
This reverts commit 5fa481422a.
 2020-10-08 18:52:17 +02:00
Aurélien
b6283c1a5d Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery 2020-10-08 16:19:10 +02:00
Aurélien
5fa481422a update dependencies migration12->13.sql #14697 2020-10-08 15:56:44 +02:00
Regis Houssin
111f73bd86 FIX add default value of timestamp for avoid error 2020-10-08 12:29:01 +02:00
Laurent Destailleur
4674eda45a Standardize columns comment 2020-10-08 10:13:44 +02:00
Aurélien
9c02390066 fix migration12->13.sql #14697 
fix drop constraint
fix error on update extrafields
 2020-10-07 21:50:54 +02:00
Aurélien
16e076d182 fix UPDATE llx_extrafields.elementtype = livraison to delivery #14697 2020-10-07 20:54:56 +02:00
Laurent Destailleur
c7ca99accb Fix default value of enabled property of menu entry 2020-10-07 15:38:07 +02:00
AurelienBinard
39d538befc Merge branch 'develop' into translateModLivraison2ModDelivery 2020-10-06 16:20:25 +02:00
Aurélien
d103a9aede rename table on migration #14697 2020-10-06 14:35:27 +02:00
Aurélien
af7c23b2ac rename folder admin/livraison.php and dependencies #14697 2020-10-06 12:05:24 +02:00
Aurélien
140200213e change table into DB and ref #14697 2020-10-06 11:04:31 +02:00
Alexandre SPANGARO
d83d9895e0 NEW Vat report - Invert constant to show by default zero vat in reports 2020-10-05 20:52:31 +02:00
Laurent Destailleur
1c34868028 Fix field must be null because there is no numbering ref module yet 2020-10-03 11:16:31 +02:00
Laurent Destailleur
c2fed95dc4 FIX #14877 2020-10-02 19:54:06 +02:00
Frédéric FRANCE
b78e506e39 add files 2020-10-02 00:25:44 +02:00
Frédéric FRANCE
7afb62c55d Merge remote-tracking branch 'upstream/develop' into ecm_extrafields 2020-10-02 00:24:48 +02:00
Frédéric FRANCE
f057488ae3 add extrafields on ecm 2020-10-02 00:21:13 +02:00