Commit Graph

85038 Commits

Author SHA1 Message Date
stickler-ci
aaf1081f17 Fixing style errors. 2020-03-12 11:46:41 +00:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-12 11:45:44 +00:00
simicar29
95efdab62a
Merge pull request #4 from simicar29/simicar29-patch-5
Load line extrafields when fetching supplier invoice
2020-03-12 12:44:31 +01:00
simicar29
325d635c48
Load line extrafields when fetching supplier invoice
PR to load extrafield values of lines when fetchinf supplier invoice.
2020-03-12 12:43:06 +01:00
Laurent Destailleur
f38134e44d Fix non transversable var 2020-03-12 12:42:34 +01:00
Laurent Destailleur
dfe947885c FIX params of setEventMessage($langs->trans('ErrorProductClone')... 2020-03-12 12:40:28 +01:00
Laurent Destailleur
31865d7ae5 Fix doc 2020-03-12 12:39:21 +01:00
florian HENRY
8e473ee365 Merge branch 'dev_ldcompta10' of github.com:FHenry/dolibarr into dev_ldcompta10 2020-03-12 12:28:30 +01:00
florian HENRY
075f0a82c2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_ldcompta10 2020-03-12 12:28:06 +01:00
florian HENRY
c5a4adf63f update doc 2020-03-12 12:25:19 +01:00
Laurent Destailleur
5dc403cb66 FIX #13304 2020-03-12 12:19:24 +01:00
Laurent Destailleur
360210d9ca Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-12 12:17:54 +01:00
Laurent Destailleur
ad22820872 FIX #13313 2020-03-12 12:15:44 +01:00
Laurent Destailleur
e7ce9c16cb FIX #13313 2020-03-12 12:15:16 +01:00
Laurent Destailleur
c1e5178eeb Doc 2020-03-12 12:01:40 +01:00
stickler-ci
85c8296e10 Fixing style errors. 2020-03-12 10:59:08 +00:00
florian HENRY
310bdf6062 NEW : accounting export LD compta version 10 2020-03-12 11:55:26 +01:00
Laurent Destailleur
d6a35db754 Look and feel v12 2020-03-12 11:13:50 +01:00
Laurent Destailleur
a6f8608ffd Fix when undefined key 2020-03-12 11:09:18 +01:00
VESSILLER
e7056a9ade NEW add a parameter to group same product 2020-03-12 11:00:17 +01:00
Laurent Destailleur
2ae7cfeffa Fix fields 2020-03-12 10:56:25 +01:00
florian HENRY
eaa9d22783 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_createLineWithCOrrectLink 2020-03-12 09:45:04 +01:00
florian HENRY
29b2ea77d5 NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other document s lines the id of origin lines and origin class line rather than origin object id and origin object type 2020-03-12 09:44:43 +01:00
Alexandre SPANGARO
59e4b3d634 FIX: Accounting management of intra-community sales to a non-taxable thirdparty
Related to this discussion :

https://www.dolibarr.fr/forum/t/gestion-des-comptes-de-vente-intracommunautaire-et-vente-ce-non-exemptee-de-tva/32285
2020-03-12 04:56:36 +01:00
Laurent Destailleur
6ce6dc145f Use colors of status in donut 2020-03-12 02:20:31 +01:00
Laurent Destailleur
618f42fc1a Fix label 2020-03-12 00:26:17 +01:00
Laurent Destailleur
1eda778518 Increase nb of operations per run 2020-03-12 00:25:19 +01:00
Laurent Destailleur
fb8e565b53 Better position on screen 2020-03-12 00:13:42 +01:00
Laurent Destailleur
af227ae164 Add picto on selection of terminal button 2020-03-11 23:57:36 +01:00
Laurent Destailleur
54da1e73ff Option to show the n first line of desc into the basket 2020-03-11 23:56:48 +01:00
Laurent Destailleur
efeda2e747 Fix add global check on perm 2020-03-11 20:14:33 +01:00
Laurent Destailleur
7b93b39bb8
Merge pull request #13310 from OPEN-DSI/new-takepos-ticket-paid
NEW no confirm discard ticket if paid
2020-03-11 20:08:40 +01:00
Laurent Destailleur
c3b51b177e
Merge pull request #13327 from OPEN-DSI/new-takepos-auto-print-ticket-paid
NEW only auto print paid ticket in cash desk
2020-03-11 20:07:50 +01:00
Laurent Destailleur
ea0fd546c7 Fix phpcs 2020-03-11 19:37:43 +01:00
Laurent Destailleur
20a695de2b Restore cron 2020-03-11 19:33:12 +01:00
Laurent Destailleur
4c87a60d6c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-11 19:27:33 +01:00
Laurent Destailleur
0f2fe30e41 Try action 2020-03-11 19:27:23 +01:00
Laurent Destailleur
5d5b2b8183
Merge pull request #13328 from OPEN-DSI/new-takepos-payment-method
NEW set payment method on paid ticket in cash desk
2020-03-11 19:26:10 +01:00
Laurent Destailleur
8f1a5c96ac Test 2020-03-11 19:23:45 +01:00
Laurent Destailleur
8edcdc742f Real run 2020-03-11 19:23:00 +01:00
Laurent Destailleur
18bd2d51e7 Test unstale 2020-03-11 19:21:21 +01:00
Laurent Destailleur
71c5c77813 Test unstale 2020-03-11 19:21:10 +01:00
Laurent Destailleur
bf3ff713e4 Text 2020-03-11 19:20:20 +01:00
Laurent Destailleur
1c889b8de1 Test unstale 2020-03-11 19:19:21 +01:00
Laurent Destailleur
39ba08981a Try unstale 2020-03-11 18:39:47 +01:00
Laurent Destailleur
19dca1dbaa Try to fix setup 2020-03-11 18:29:38 +01:00
Laurent Destailleur
fb73e00346 Use version in master 2020-03-11 18:24:24 +01:00
Laurent Destailleur
fc05e8d768 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/bookmarks/bookmarks.lib.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/en_US/other.lang
2020-03-11 18:03:15 +01:00
florian HENRY
6edaa7ac11 fix getentity on comm/card.php 2020-03-11 18:00:35 +01:00
florian HENRY
c4610fee8b Merge branch '11.0' of github.com:Dolibarr/dolibarr into fix_11_multiEntityOnCommCardElement 2020-03-11 17:58:51 +01:00