lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
84,503 Commits 43 Branches 150 Tags 886 MiB
d3447bb44b
Commit Graph

74232 Commits

Author SHA1 Message Date
Laurent Destailleur
d3447bb44b Fix duplicate / 2020-03-13 10:14:26 +01:00
Laurent Destailleur
3cf7105635 Fix language in sublang dir 2020-03-13 10:05:54 +01:00
Laurent Destailleur
4bd1c6c717 Fix hreflink 2020-03-13 09:51:41 +01:00
Laurent Destailleur
68f14ef483 Fix missing js 2020-03-13 09:37:26 +01:00
Laurent Destailleur
6dda972ff5 Doxygen 2020-03-13 04:12:42 +01:00
Laurent Destailleur
29843165ec Use the header and footer of public pages for the payment ok and ko page 2020-03-13 03:28:13 +01:00
Laurent Destailleur
35fae3ec5d NEW Upgrade Stripe library to 6.43.1 2020-03-13 03:07:28 +01:00
Laurent Destailleur
f3996c0038 Code comment 2020-03-13 02:35:28 +01:00
Laurent Destailleur
94589158c0 Move class from external project as internal class (project is dead) 2020-03-13 02:32:33 +01:00
Laurent Destailleur
f07d228537 Upgrade mobiledetect from 2.8.33 to 2.8.34 2020-03-13 02:28:01 +01:00
Laurent Destailleur
fede6da5cf Move Chartjs into correct dir name 2020-03-13 02:17:15 +01:00
Laurent Destailleur
6f636d6d69 NEW Add field author public alias for blog post on website module 2020-03-12 20:50:36 +01:00
Laurent Destailleur
69931efb6c FIX #10864 2020-03-12 17:01:07 +01:00
Laurent Destailleur
967d4223c6 FIX #13277 2020-03-12 16:15:48 +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
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
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
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
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
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