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

85019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ec0fe28da8
Merge pull request #13452 from andreubisquerra/master 
NEW: Cash Control in TakePOS
 2020-04-02 12:51:36 +02:00
Laurent Destailleur
deaae1d1f1
Merge pull request #13469 from cfoellmann/batch-extension 
change batches max length to 128 characters on sql migration
 2020-04-02 12:49:31 +02:00
Laurent Destailleur
c225f35eff
Update 11.0.0-12.0.0.sql 2020-04-02 12:49:20 +02:00
Laurent Destailleur
e79c98baed
Merge pull request #13470 from jribal/patch-1 
On _checkAccessToResource: category -> categorie
 2020-04-02 12:44:26 +02:00
Laurent Destailleur
bb9a4324d1
Merge pull request #13471 from atm-florianm/NEW_add_author_column_on_invoice_list_and_supplier_invoice_list 
NEW: "author" column in the client/supplier invoice lists
 2020-04-02 12:40:51 +02:00
Laurent Destailleur
5d9d62f185
Merge pull request #13480 from atm-florian/develop 
fix: correct hook init invoice_rec list
 2020-04-02 12:38:32 +02:00
Laurent Destailleur
9f55918cb8 Remove Geoipv1 library. We use now v2 2020-04-02 12:37:21 +02:00
Laurent Destailleur
b8eaf8dd03 Removed jflot js library (we now use ChartJS) 2020-04-02 12:29:15 +02:00
Laurent Destailleur
84cda962c1 Clean dead code 2020-04-02 12:03:29 +02:00
florian HENRY
10391a5769 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2020-04-02 10:45:46 +02:00
florian HENRY
609de965b1 fix: hook init invoicerec list normalyse 2020-04-02 10:45:14 +02:00
Laurent Destailleur
f6b216eafc Fix travis 2020-04-01 23:32:44 +02:00
Laurent Destailleur
6aea67a5b9 Work on extralanguages 2020-04-01 23:15:53 +02:00
Laurent Destailleur
184d50171d Update example for clamav - prefer clamav daemon 2020-04-01 22:01:05 +02:00
Laurent Destailleur
d2de6a22eb WIP Can set values in extra languages 2020-04-01 18:11:28 +02:00
Florian Mortgat
f52af23396 NEW: "author" column in the client/supplier invoice lists 2020-04-01 17:09:01 +02:00
Laurent Destailleur
4727800206 Can show technical ID of any object in banner. 2020-04-01 16:51:45 +02:00
Laurent Destailleur
33d2b61c19 Work on extralanguages 2020-04-01 16:21:03 +02:00
jribal
cae0f210a2
On _checkAccessToResource: category -> categorie 2020-04-01 11:09:40 +01:00
Christian Foellmann
6aa65f1a02 change batches max length to 128 characters on sql migration 2020-04-01 09:57:51 +02:00
Laurent Destailleur
b407797ca3 Fix css 2020-03-31 17:45:45 +02:00
Laurent Destailleur
766f480741 css 2020-03-31 16:24:33 +02:00
Laurent Destailleur
f09321a497 css 2020-03-31 13:57:19 +02:00
Laurent Destailleur
e75e49426f Look and feel v12 2020-03-31 13:52:02 +02:00
Laurent Destailleur
0b486ea5ad CSS 2020-03-31 13:28:19 +02:00
Laurent Destailleur
e0d713bbef Update demo 2020-03-31 12:56:21 +02:00
Laurent Destailleur
0b1cfcc0cc Fix phpcs 2020-03-31 00:13:27 +02:00
Laurent Destailleur
353d561060 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-31 00:11:46 +02:00
Laurent Destailleur
416d1ce3f0 Fix phpcs 2020-03-31 00:11:31 +02:00
jove@bisquerra.com
d9614ac6fc Integrate Cash Control in TakePOS 2020-03-30 20:05:45 +02:00
Laurent Destailleur
2e1fe7b989
Merge pull request #13451 from andreubisquerra/develop 
Log CUPS print error on Receipt Printer module
 2020-03-30 20:02:56 +02:00
Laurent Destailleur
5f8d9fc8e8
Merge pull request #13347 from bafbes/abb60311 
NEW:Show units of products in stocks and hide total units if content is of diffents units
 2020-03-30 20:01:59 +02:00
Laurent Destailleur
774137b937
Update card.php 2020-03-30 20:00:59 +02:00
Laurent Destailleur
401265d09e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-30 19:56:59 +02:00
Laurent Destailleur
3860f24908 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/product/class/product.class.php
 2020-03-30 19:56:31 +02:00
Laurent Destailleur
d0c179e1e9 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-30 19:54:32 +02:00
Laurent Destailleur
878c4fb106 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-03-30 19:53:40 +02:00
Laurent Destailleur
fbce8fcfe3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/product/class/product.class.php
 2020-03-30 19:53:31 +02:00
Laurent Destailleur
125e964352 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/product/class/product.class.php
 2020-03-30 19:50:47 +02:00
Laurent Destailleur
b081cf5cba Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/product/class/product.class.php
 2020-03-30 19:48:41 +02:00
Laurent Destailleur
3ea9c297ea Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2020-03-30 19:46:23 +02:00
Laurent Destailleur
474260e526
Merge pull request #13447 from c3do/patch-1 
Fix can set desiredstock to (int) 0 from API Rest
 2020-03-30 19:46:02 +02:00
Laurent Destailleur
0b7b97ec34 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-30 19:43:03 +02:00
Laurent Destailleur
efaea37d61 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2020-03-30 19:42:53 +02:00
Laurent Destailleur
6ecacb9c29 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-30 19:38:07 +02:00
Laurent Destailleur
07d64f47e3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-30 19:37:29 +02:00
Laurent Destailleur
7466eaade3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-30 19:37:01 +02:00
Laurent Destailleur
9fcbec9f02 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-30 19:36:07 +02:00
Laurent Destailleur
06ad21f2e8
Merge pull request #13442 from fappels/9.0_newToken 
Improve modulebuilder compatiblity with maintained versions.
 2020-03-30 19:35:45 +02:00
Laurent Destailleur
ff44e2d2ac
Merge pull request #13448 from atm-quentin/FIX_missing_array_option_supplier_proposal_to_supplier_order 
FIX missing array option
 2020-03-30 19:35:20 +02:00