Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
96,756 Commits 36 Branches 189 Tags
49faedae6fef9775b889a063921ee252aa06ffad
Commit Graph

2315 Commits

Author SHA1 Message Date
Laurent Destailleur
8df083c955 Look and feel v14 2021-03-20 18:43:44 +01:00
Laurent Destailleur
e366d2c379 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/admin/tools/export_files.php
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
	test/phpunit/FilesLibTest.php
 2021-03-16 14:57:04 +01:00
Laurent Destailleur
8243ffc174 Changelog 2021-03-15 14:53:40 +01:00
Laurent Destailleur
401c209a76 Prepare 13.0.2 2021-03-14 23:54:52 +01:00
Laurent Destailleur
29467e983a Code comment 2021-02-26 13:50:54 +01:00
Laurent Destailleur
f6080d45fa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-22 16:21:26 +01:00
Laurent Destailleur
f99232e66e Merge branch 'develop' into 14a21 2021-02-22 11:18:07 +01:00
Alexandre SPANGARO
2cd181b86d Code enhanced - Standardize field name #14697 2021-02-21 22:07:58 +01:00
Alexandre SPANGARO
5fd2f33ade ChangeLog 2021-02-21 21:49:29 +01:00
Laurent Destailleur
e3419df36e Merge branch 'develop' into 14a20 2021-02-21 20:28:06 +01:00
Laurent Destailleur
4b632fb24f Merge branch 'develop' into 14a19 2021-02-20 17:08:23 +01:00
Laurent Destailleur
7c25f06f58 Merge pull request #16353 from aspangaro/14a18 
Code enhanced - Standardize field name #14697
 2021-02-20 16:51:34 +01:00
UT from dolibit
6eb179a6fb Update ChangeLog 
minor addings for 13.0.1
 2021-02-20 13:14:27 +01:00
Alexandre SPANGARO
3dcfe40e71 Code enhanced - Standardize field name #14697 2021-02-20 08:00:27 +01:00
Alexandre SPANGARO
1017d480f9 Code enhanced - Standardize field name #14697 2021-02-20 07:08:37 +01:00
Laurent Destailleur
712c2f20df Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-02-19 22:06:48 +01:00
Laurent Destailleur
b167a4a0c7 FIX date selector when using reduced year (like on smartphone) 2021-02-19 22:00:44 +01:00
Laurent Destailleur
d88560c2ee changelog 2021-02-19 18:04:14 +01:00
Laurent Destailleur
b6211a7990 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-19 14:12:00 +01:00
Laurent Destailleur
3285dd3199 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	ChangeLog
	htdocs/compta/bank/various_payment/list.php
 2021-02-19 14:11:08 +01:00
Alexandre SPANGARO
041390dc22 Code enhanced - Standardize field name #14697 2021-02-19 06:49:24 +01:00
Laurent Destailleur
0c73cdb129 Prepare 12.0.5 2021-02-16 13:42:26 +01:00
Laurent Destailleur
026259ebd7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/fournisseurs.php
 2021-02-15 13:12:27 +01:00
Laurent Destailleur
7f64af9c90 Doc 2021-02-11 20:08:25 +01:00
Laurent Destailleur
1b11d9d0e9 FIX payment term label on PDF 2021-02-11 17:48:53 +01:00
Laurent Destailleur
060e64fe02 FIX vat value when code contains number 2021-02-10 01:10:51 +01:00
Laurent Destailleur
33a4355743 Fix summary of report 2021-02-09 23:36:44 +01:00
Laurent Destailleur
52ee530e70 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-09 22:03:38 +01:00
Laurent Destailleur
3a9cf8eb7a FIX: ODT generation very slow 2021-02-09 22:02:48 +01:00
Laurent Destailleur
d588086c47 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-09 21:21:28 +01:00
Laurent Destailleur
e1af57f540 FIX status late on purchase orders 2021-02-09 20:46:17 +01:00
Laurent Destailleur
92a19c0caa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2021-02-09 18:34:50 +01:00
Laurent Destailleur
67fe91f6aa Prepare 13.0.1 2021-02-09 14:15:21 +01:00
Laurent Destailleur
641885d814 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-31 19:05:27 +01:00
Laurent Destailleur
4c9bf1d97e Advice for ajax services 2021-01-31 13:21:12 +01:00
Laurent Destailleur
d7bf173f0d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/lib/functions.lib.php
	test/phpunit/SecurityTest.php
 2021-01-26 12:12:35 +01:00
Laurent Destailleur
84bab7169e Document 2021-01-24 15:52:17 +01:00
Laurent Destailleur
56d13c96f4 Doc 2021-01-24 15:51:14 +01:00
Laurent Destailleur
643309dc6a Update doc 2021-01-24 15:50:19 +01:00
Laurent Destailleur
0f5fc7353e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/admin/mailing.php
	htdocs/admin/paymentbybanktransfer.php
	htdocs/admin/prelevement.php
	htdocs/modulebuilder/template/admin/setup.php
 2021-01-24 15:29:53 +01:00
UT from dolibit
7629961b50 Update ChangeLog 
moved to TAKEPOS:
NEW: delayed payment in TakePOS                                           ->  NEW: TakePOS add delayed payment
NEW: display date range if exist in TakePOS                              ->  NEW: TakePOS display date range if exist
NEW: display resiliate status in TakePOS for member                ->  NEW: TakePOS display resiliate status for members
 2021-01-19 12:44:13 +01:00
Laurent Destailleur
329499c103 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-16 16:43:00 +01:00
Laurent Destailleur
61b8a69787 Code comment 2021-01-16 15:40:59 +01:00
UT from dolibit
933367a4a2 Update ChangeLog 
- changed  "Nature of product is now a dictionay" to   "Products - Nature of product is now a dictionary   #13287"
- sortings
 2021-01-13 13:56:01 +01:00
UT from dolibit
ee55d43d12 Update ChangeLog 
- add EORI No. as ProfID5 ->  #15382
- sorting to TakePOS
- sorting new Modules
 2021-01-08 13:54:43 +01:00
UT from dolibit
40f2d884dd Update ChangeLog 
sorting TakePOS changelogs
minor edits
 2021-01-06 13:09:42 +01:00
Laurent Destailleur
ba68c958e1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 19:12:57 +01:00
UT from dolibit
346bddf32f Update ChangeLog 
some minor changings
add info #15180
sorting
add info #14725
 2021-01-05 18:54:49 +01:00
Laurent Destailleur
702d8f9f37 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into 
develop

Conflicts:
	htdocs/theme/eldy/info-box.inc.php
 2021-01-05 01:48:25 +01:00
UT from dolibit
9bd6cf8bbb Update ChangeLog 2020-12-23 16:22:49 +01:00