Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,625 Commits 36 Branches 189 Tags
a4f44d61a88e787527b34a6d71fc3a2bc6af24d4
Commit Graph

19091 Commits

Author SHA1 Message Date
Laurent Destailleur
22d4f37e58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/class/html.form.class.php
 2020-01-10 14:31:37 +01:00
Laurent Destailleur
b47db086cb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/inventory/class/inventory.class.php
	htdocs/product/inventory/list.php
 2020-01-10 14:30:42 +01:00
Laurent Destailleur
d97a59ac4a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	ChangeLog
	htdocs/comm/remise.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
	htdocs/variants/combinations.php
 2020-01-10 14:25:26 +01:00
Laurent Destailleur
c4d62e0ea3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/list.php
 2020-01-10 13:51:29 +01:00
Laurent Destailleur
9ebdd82edb Fix We must refuse to delete a various payment if payment was dispatched 
in accountancy.
 2020-01-10 02:43:24 +01:00
Laurent Destailleur
22b6828e09 Merge pull request #12792 from aspangaro/12.0_a5 
NEW Accountancy - Add possibility to manage an short alternative label for account - Use to simplify accountancy
 2020-01-10 00:23:54 +01:00
Laurent Destailleur
e36bf0261c Merge pull request #12811 from simicar29/develop 
Avoid adding unsubscribed contacts in mailing list
 2020-01-10 00:18:12 +01:00
Laurent Destailleur
286d278125 Merge pull request #12816 from artis-auxilium/fix_massaction_check 
Fix Check array of action after kooks
 2020-01-10 00:16:21 +01:00
Scrutinizer Auto-Fixer
8691194627 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-09 23:03:10 +00:00
Laurent Destailleur
f48c7d2ecf Fix modulebuilder 2020-01-09 22:31:23 +01:00
Laurent Destailleur
0e58edd896 Fix modulebuilder 2020-01-09 22:27:24 +01:00
florian HENRY
2847131be0 Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0 2020-01-09 16:31:11 +01:00
florian HENRY
83ada939d5 fix warning 2020-01-09 16:26:30 +01:00
Laurent Destailleur
255c280170 Fix visibility 2020-01-09 11:44:15 +01:00
Laurent Destailleur
20b63b702e Fix visibility 2020-01-09 11:42:57 +01:00
Laurent Destailleur
115b7f2c6b Fix break on second column 2020-01-09 11:05:23 +01:00
Laurent Destailleur
60935b93c0 Fix break on second column 2020-01-09 11:04:58 +01:00
Laurent Destailleur
124f41f863 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-09 09:10:11 +01:00
Laurent Destailleur
0802df78b5 Debug MRP 2020-01-08 17:56:02 +01:00
Laurent Destailleur
97f62c68f2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-08 13:38:03 +01:00
Dev2a
c9c22fe80b Fix Style 2020-01-07 22:12:35 +01:00
Laurent Destailleur
622dc7e8d7 Debug v11 2020-01-07 22:01:55 +01:00
Dev2a
57c954f2e8 Fix Check array of action after kooks 2020-01-07 21:41:36 +01:00
Dev2a
0214d15c55 Fix Check array of action after kooks 2020-01-07 21:39:20 +01:00
Laurent Destailleur
ec81474694 Fix form confirm for "one column" type. 2020-01-07 20:36:36 +01:00
Laurent Destailleur
7ef3ee56bd Fix MRP 2020-01-07 20:28:21 +01:00
Laurent Destailleur
b9a7401f1d Doc 2020-01-07 16:29:37 +01:00
simicar29
7e29e57aff Avoid adding unsubscribed contacts in mailing list 
Add an sql criterion to exclude unsubscribed email adresses from count of contacts (function getNbOfRecipients) and avoid their inclusion in mailing lists (function add_to_target)
 2020-01-07 16:13:48 +01:00
Laurent Destailleur
a947215ac1 Fix morecss param was lost 2020-01-07 14:40:59 +01:00
Laurent Destailleur
0e2edde6d3 Look and feel v11 2020-01-07 14:25:58 +01:00
Laurent Destailleur
f4d7958ead Fix duplicate record in list of events for projects 2020-01-07 14:16:13 +01:00
Laurent Destailleur
f05873201c Fix duplicate record in list of events for projects 2020-01-07 14:14:47 +01:00
Laurent Destailleur
444e2f1130 Fix length of column 2020-01-07 14:01:45 +01:00
Laurent Destailleur
eea8a4df7b Fix length of column 2020-01-07 14:01:12 +01:00
Laurent Destailleur
750fa83e96 FIX Bad management of elementtype not llx_actioncomm 2020-01-07 13:49:52 +01:00
Laurent Destailleur
6029e82e90 FIX Bad management of elementtype not llx_actioncomm 2020-01-07 13:48:44 +01:00
Laurent Destailleur
d80764a179 Fix column not visible after switching column when visibility=3 2020-01-07 12:43:05 +01:00
Laurent Destailleur
a1803f5d62 Fix column not visible after switching column when visibility=3 2020-01-07 12:39:05 +01:00
VESSILLER
c0751a69e4 NEW add project ref in events export 2020-01-07 10:56:46 +01:00
Laurent Destailleur
8c67ea14a0 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-06 15:30:22 +01:00
Laurent Destailleur
40ba90d170 css 2020-01-06 15:29:18 +01:00
Laurent Destailleur
063cb6bf83 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-06 15:14:41 +01:00
Laurent Destailleur
8384c5b03c css 2020-01-06 15:14:14 +01:00
Laurent Destailleur
57bbac2015 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-06 14:09:46 +01:00
Laurent Destailleur
c02a27ba77 Fix log 2020-01-06 13:25:14 +01:00
Laurent Destailleur
9df85a26b8 Fix var_dump 2020-01-06 03:50:42 +01:00
Guillaume Matheron
ffa88ad11f Merge remote-tracking branch 'upstream/develop' into develop 2020-01-05 14:51:03 +01:00
Laurent Destailleur
6dcba0f053 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-04 14:27:55 +01:00
Laurent Destailleur
38de69f5a9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/list.php
	htdocs/compta/bank/releve.php
	htdocs/compta/salaries/card.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/boxes.lang
	htdocs/langs/en_US/main.lang
	htdocs/product/class/product.class.php
	htdocs/product/reassort.php
	htdocs/product/stock/product.php
	htdocs/projet/element.php
 2020-01-04 14:20:25 +01:00
Alexandre SPANGARO
c3518426bd NEW Accountancy - Add possibility to manage an short alternative label - use to simplify 2020-01-03 22:05:49 +01:00