Commit Graph

82261 Commits

Author SHA1 Message Date
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
f05873201c Fix duplicate record in list of events for projects 2020-01-07 14:14:47 +01:00
Laurent Destailleur
f5c98290e1 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-07 14:02:27 +01:00
Laurent Destailleur
eea8a4df7b Fix length of column 2020-01-07 14:01:12 +01:00
Laurent Destailleur
8e3eaed280 Modulebuilder template 2020-01-07 13:54:13 +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
9729b3a1c7 Fix modulebuilder template 2020-01-07 12:39:47 +01:00
Laurent Destailleur
a1803f5d62 Fix column not visible after switching column when visibility=3 2020-01-07 12:39:05 +01:00
Laurent Destailleur
6602a7046e Doc 2020-01-07 11:21:17 +01:00
Laurent Destailleur
6cd6de092d Fix modulebuilder 2020-01-07 11:04:13 +01:00
Laurent Destailleur
ccceaac358 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-06 17:20:54 +01:00
Laurent Destailleur
ec2ea612ae Fix GETPOST 2020-01-06 17:19:49 +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
73806d6a3a Justificativedoc validation 2020-01-06 14:35:11 +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
804f7f3e1e Fix modulebuilder templates 2020-01-06 14:03:24 +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
Laurent Destailleur
0e496d2191 MRP 2020-01-06 02:55:09 +01:00
Laurent Destailleur
58ff3e563d Fix link a href 2020-01-06 02:21:42 +01:00
Laurent Destailleur
012e916c4b Fix tag 2020-01-05 19:59:14 +01:00
Laurent Destailleur
d077a1ca60 Fix add second in fulltag to avoid pb of idempotency when submitting
page in same minutes with a different amount.
2020-01-05 19:42:18 +01:00
Laurent Destailleur
d8e98753d2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-05 15:37:16 +01:00
Laurent Destailleur
8f756ddbb2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-05 15:36:56 +01:00
Laurent Destailleur
f919fee929 Fix phpcs 2020-01-05 15:36:31 +01:00
Laurent Destailleur
73e62c65aa Fix phpcs 2020-01-04 15:20:10 +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
1a84f54b06 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/product/reassort.php
2020-01-04 14:27:16 +01:00
Laurent Destailleur
eca91af2ca Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-01-04 14:21:56 +01:00
Laurent Destailleur
7853427bb1 FIX product with empty stock were not visible 2020-01-04 14:21:38 +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
Laurent Destailleur
b9e0f8999f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2020-01-04 14:03:21 +01:00
Laurent Destailleur
a84ff7089c Fix static text that is never updated 2020-01-03 21:14:04 +01:00
Laurent Destailleur
991bb5a2eb Update issue templates 2020-01-03 21:02:05 +01:00
Laurent Destailleur
0dafbd194f
Merge pull request #12750 from OPEN-DSI/v10-fix-product-virtual-stock-stats-sending
FIX add product qty in shipment already sent (fix for option STOCK_CALCULATE_ON_SHIPMENT_CLOSE)
2020-01-03 20:56:59 +01:00
Laurent Destailleur
37f9307732
Update product.class.php 2020-01-03 20:53:49 +01:00
VESSILLER
6e9bb5d7da FIX sql bad request in product buying price extrafields 2020-01-03 20:49:54 +01:00
Laurent Destailleur
cbb47e20cb
Merge pull request #12759 from OPEN-DSI/fix-product-supplier-price-extrafields
FIX sql bad request in product buying price extrafields
2020-01-03 20:48:45 +01:00
Laurent Destailleur
88d97104be
Merge pull request #12789 from aspangaro/10.0_p32
FIX Some problems on conciliation with others modules
2020-01-03 20:47:33 +01:00
Laurent Destailleur
e178d38bf8
Merge pull request #12791 from ptocquin/patch-1
Update api_supplier_invoices.class.php
2020-01-03 20:42:55 +01:00
Laurent Destailleur
e83b71f271
Merge pull request #12787 from aspangaro/10.0_p30
FIX Loan card - Wrong language key used
2020-01-03 20:42:01 +01:00
Laurent Destailleur
d5ad0180a0
Merge pull request #12786 from andreubisquerra/master
TakePOS press 'ENTER' event
2020-01-03 20:41:41 +01:00
Laurent Destailleur
b452fc8442
Merge pull request #12788 from aspangaro/10.0_p31
FIX typo on language key
2020-01-03 20:41:04 +01:00
Laurent Destailleur
2c141d57df
Merge pull request #12790 from mapiolca/patch-18
FIX an issue that shows all entities stock
2020-01-03 20:40:44 +01:00
Pierre Tocquin
8a5f3d48f4
Update api_supplier_invoices.class.php
Correction test data 'date'  lors de la création d'une facture fournisseur. `array_keys` remplacé par `array_key_exists` dans la clause `if`. Cette clause est correcte dans api_invoices.class.php.
2020-01-03 19:18:24 +01:00