Commit Graph

84479 Commits

Author SHA1 Message Date
Laurent Destailleur
967d4223c6 FIX #13277 2020-03-12 16:15:48 +01:00
Laurent Destailleur
77730b882c Try to use my on code of stale 2020-03-12 14:28:33 +01:00
Laurent Destailleur
b9883523f1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-12 13:08:56 +01:00
Laurent Destailleur
6f0f1e1163 Fix edit of country of establishment 2020-03-12 13:08:42 +01:00
Laurent Destailleur
d380da3f4c
Merge pull request #13250 from FHenry/dev_fix_createLineWithCOrrectLink
NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other documents lines the id of original lines and origin class line rather than origin object id and origin object type
2020-03-12 12:57:04 +01:00
Laurent Destailleur
2994a5f35e
Merge pull request #13336 from Dolibarr/scrutinizer-patch-2
Scrutinizer Auto-Fixes
2020-03-12 12:47:52 +01:00
Laurent Destailleur
54b32d94e0 Fix field required 2020-03-12 12:47:08 +01:00
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
Laurent Destailleur
f38134e44d Fix non transversable var 2020-03-12 12:42:34 +01:00
Laurent Destailleur
31865d7ae5 Fix doc 2020-03-12 12:39:21 +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
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
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
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
Laurent Destailleur
d6535c0584 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-11 17:56:58 +01:00
Laurent Destailleur
58643d2dad WIP 2020-03-11 17:56:47 +01:00
VESSILLER
5d740d16fb NEW set payment method on paid ticket in cash desk 2020-03-11 17:42:30 +01:00
VESSILLER
e4c97f0b15 FIX user permission on ajax request getInvoice 2020-03-11 17:16:44 +01:00
Laurent Destailleur
61cb1ec81a
Merge pull request #13185 from atm-john/12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
NEW : Allow extrafields on pdf : extend to line desc
2020-03-11 17:12:14 +01:00
Laurent Destailleur
89a8531140
Merge pull request #13237 from aspangaro/12.0_a18
NEW: Accountancy - Add mode intra & export for product or service bought
2020-03-11 17:08:49 +01:00