lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
89,109 Commits 43 Branches 150 Tags 886 MiB
9165ea9e67
Commit Graph

89109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
altairis
98e07b6d32 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2020-03-12 09:19:56 +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
florian HENRY
f40c8ce507 fix getentity on comm/card.php 2020-03-11 17:58:41 +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
Laurent Destailleur
4088553d61
Merge pull request #13321 from OPEN-DSI/new-takepos-product-sorted-by-label 
NEW add a parameter to sort product by label in cash desk
 2020-03-11 17:07:30 +01:00
Laurent Destailleur
40973cfca9
Merge pull request #13320 from OPEN-DSI/new-takepos-search-on-keycode 
New takepos search on keycode
 2020-03-11 17:07:03 +01:00
Laurent Destailleur
8609bf9c9c
Merge pull request #13318 from OPEN-DSI/new-takepos-payment-buttons 
NEW add icon on payment buttons in cash desk
 2020-03-11 17:06:04 +01:00
Laurent Destailleur
57440cc0dd
Merge pull request #13311 from OPEN-DSI/new-takepos-categories-sorted 
NEW categories and subcategories sorted by label in TakePOS
 2020-03-11 17:05:40 +01:00
Laurent Destailleur
4903287204 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/boxes/box_commandes.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2020-03-11 17:04:28 +01:00
Laurent Destailleur
27bdee9df1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-11 17:01:47 +01:00
Laurent Destailleur
c9b715b7ad Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-11 17:01:31 +01:00
Laurent Destailleur
7afbb5ce9c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-03-11 17:00:01 +01:00
Laurent Destailleur
467dc2da7a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2020-03-11 16:59:35 +01:00
Laurent Destailleur
21dbddac76
Merge pull request #13317 from TobiasSekan/FixErrorOnAddLineToOrder 
FIX Error on add a new line to a supplier order (with ODT templates)
 2020-03-11 16:58:44 +01:00
VESSILLER
e95e182419 NEW only auto print paid ticket in cash desk 2020-03-11 16:53:27 +01:00