Commit Graph

76874 Commits

Author SHA1 Message Date
Laurent Destailleur
de53a23c06
Merge pull request #11405 from atm-quentin/FIX_buyprice_barcode_default_val
FIX buyprice barcode default val
2019-06-25 14:27:02 +02:00
atm-quentin
4b3824a1a9 FIX buyprice barcode default val 2019-06-25 14:17:31 +02:00
Laurent Destailleur
fffdd8797d FIX Fallback on main language for alternative languages 2019-06-25 14:04:34 +02:00
Laurent Destailleur
06b3f6a62f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/subscription/list.php
2019-06-25 13:03:54 +02:00
Laurent Destailleur
def94b55c0 CSS 2019-06-25 13:02:11 +02:00
Laurent Destailleur
fd4dd05040 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:34 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
1c924ef17e Fix bad label on supplier invoice 2019-06-25 12:54:02 +02:00
Laurent Destailleur
8cc6c18931 Fix bad label on supplier invoice 2019-06-25 12:53:23 +02:00
Laurent Destailleur
3c6d271c67 Removed deprecated fields 2019-06-25 12:42:36 +02:00
Laurent Destailleur
560f145a32 Fix css 2019-06-25 11:35:40 +02:00
Laurent Destailleur
b6ad78fdd9 Fix sort 2019-06-25 11:25:36 +02:00
Laurent Destailleur
b8b0ad0d27 Fix migration 2019-06-25 11:22:35 +02:00
Laurent Destailleur
5031b6c06b Fix bad id 2019-06-25 11:18:31 +02:00
Laurent Destailleur
5f17cfe462 Fix bad id 2019-06-25 11:09:13 +02:00
Laurent Destailleur
27be93f535 Fix bad id 2019-06-25 11:08:42 +02:00
Laurent Destailleur
4ed2db6d21 Fix bad id 2019-06-25 11:08:14 +02:00
Laurent Destailleur
e6b643e073 Fix syntax error 2019-06-25 11:07:14 +02:00
Laurent Destailleur
36f1527f76 Fix backward compatibility for type of members 2019-06-25 11:06:10 +02:00
Laurent Destailleur
ca3988ca73 Fix backward compatibility for type of members 2019-06-25 10:58:44 +02:00
Laurent Destailleur
732fd8a04b Fix look and feel v10 2019-06-25 10:28:58 +02:00
Laurent Destailleur
74f61b3b9a Fix status not loaded 2019-06-25 10:23:30 +02:00
Laurent Destailleur
7de0f5c0be NEW Avoid wrap between picto and text on getNomUrl 2019-06-25 10:22:39 +02:00
Laurent Destailleur
6b8262bd8f Fix status not loaded 2019-06-25 10:12:24 +02:00
Laurent Destailleur
51506724ef FIX Do no record log in archived log for draft documents. 2019-06-24 23:36:52 +02:00
Laurent Destailleur
d048c0f125 Removed dead code 2019-06-24 23:00:04 +02:00
Laurent Destailleur
43d65e8073 Add hook 2019-06-24 22:59:00 +02:00
Laurent Destailleur
3ca258c93d Remove dead code 2019-06-24 22:58:21 +02:00
Laurent Destailleur
83ec64d473 Add hook getnomurltooltip on contract 2019-06-24 22:52:27 +02:00
Laurent Destailleur
a7bd734ece Rename ->produit into ->product. Still permissions to rename. 2019-06-24 21:18:49 +02:00
Laurent Destailleur
ad0ed2bb19 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-24 21:03:16 +02:00
Laurent Destailleur
d49891d009 All ->lignes were renamed into ->lines 2019-06-24 21:03:04 +02:00
Laurent Destailleur
d075f42d8b
Merge pull request #11028 from aspangaro/10.0_accounting6
NEW Accounting - Add rights on export, delete operations in ledger
2019-06-24 19:59:18 +02:00
Laurent Destailleur
229dd4d3f5
Merge branch 'develop' into 10.0_accounting6 2019-06-24 19:59:11 +02:00
Laurent Destailleur
f66281d7e5
Update modAccounting.class.php 2019-06-24 19:50:22 +02:00
Laurent Destailleur
366efff633
Merge pull request #11107 from gentooza/develop
NEW adding 'formObjectOptions' hooks loading at card.php of adherents module
2019-06-24 19:20:36 +02:00
Laurent Destailleur
c3a109d790
Update card.php 2019-06-24 19:20:27 +02:00
Laurent Destailleur
2a3b4c3fd7
Merge pull request #11111 from OPEN-DSI/new-extrafields-separator-collapse
NEW add extrafield separator collapsing capabilities
2019-06-24 19:04:51 +02:00
Laurent Destailleur
23c8b3305c Doc 2019-06-24 19:02:59 +02:00
Laurent Destailleur
9961b9c132
Merge pull request #11136 from ptibogxiv/patch-175
NEW add multicurrency rate at currency list API
2019-06-24 19:00:27 +02:00
Laurent Destailleur
604633afd1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-24 18:45:15 +02:00
Laurent Destailleur
31ffa6bc69 FIX #11218 #11150 2019-06-24 18:43:16 +02:00
Laurent Destailleur
28deca7100 FIX #11218 #11150 2019-06-24 18:40:31 +02:00
Laurent Destailleur
57140b79dc Restore official text of licence 2019-06-24 18:30:07 +02:00
Laurent Destailleur
d1dc189a8f
Merge pull request #11383 from atm-maxime/new_task_totaldeclared
NEW Add global task declared progression
2019-06-24 18:12:55 +02:00
Laurent Destailleur
35c3eb0d7e Fix conflict in a translation key 2019-06-24 17:59:00 +02:00
Laurent Destailleur
857233f175
Merge pull request #11394 from grandoc/new_branch_23_06_2019
New branch 23 06 2019
2019-06-24 16:40:50 +02:00
Laurent Destailleur
d6814111f3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-24 16:38:26 +02:00
Laurent Destailleur
803e2aa337 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-24 16:37:50 +02:00
Laurent Destailleur
862e20e820 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/actions_massactions.inc.php
2019-06-24 16:37:29 +02:00