Laurent Destailleur
c9834117c9
Fix #5156
2016-06-04 02:03:30 +02:00
phf
b000ccf2e2
Fix traduction for multicurrency module
2016-06-04 01:46:10 +02:00
Laurent Destailleur
b57476153f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/admin/menus/edit.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/societe/consumption.php
2016-06-04 01:14:36 +02:00
Laurent Destailleur
b51c4ab57b
Merge pull request #5275 from novalore/develop
...
Miscellaneous typos and errors in en_US lang files
2016-06-04 00:20:27 +02:00
novalore
e2ba9c72a8
French string in main.lang
2016-06-04 00:18:15 +02:00
novalore
1227ee5eb6
Miscellaneous typos and errors in en_US lang files
2016-06-04 00:14:56 +02:00
Laurent Destailleur
776118a152
FIX Translation of lithuania
2016-06-03 21:32:12 +02:00
Laurent Destailleur
ebd8f2cf86
Prepare 4.0
2016-06-02 13:33:22 +02:00
Laurent Destailleur
5106f40a56
Merge branch 'develop_NEW_decrease_stock_expedition_classify' of
...
https://github.com/atm-alexis/dolibarr into
atm-alexis-develop_NEW_decrease_stock_expedition_classify
Conflicts:
htdocs/expedition/class/expedition.class.php
2016-06-02 11:23:49 +02:00
Laurent Destailleur
780d1628a9
Missing trans
2016-06-01 21:19:21 +02:00
Laurent Destailleur
7519c4a602
FIX Log of tax
...
FIX Missing import key on social contributions and missing class to
manage type of social contributions.
2016-06-01 13:24:27 +02:00
Laurent Destailleur
0d277083e6
Fix duplicate translation
2016-05-30 19:56:59 +02:00
Laurent Destailleur
3ddf427ff1
FIX Legal issue for GB. Add hidden option for this.
2016-05-30 00:52:16 +02:00
Laurent Destailleur
c653acd4ce
Minor fixes
2016-05-27 14:56:59 +02:00
Laurent Destailleur
b410aa57b9
Fix: Fetching category on label is not enough. We must introduce type
2016-05-25 15:36:48 +02:00
Laurent Destailleur
b476153b8b
Move POS at end of top menu
2016-05-25 00:02:48 +02:00
Laurent Destailleur
a587ba496c
NEW Can select fields on supplier orders
2016-05-24 18:43:35 +02:00
Laurent Destailleur
7935967c62
Fix duplicate translation key
2016-05-21 12:30:58 +02:00
Laurent Destailleur
5fd64c81a6
Missing translation
2016-05-21 12:21:17 +02:00
Laurent Destailleur
fd38db388a
Rename box into widget
2016-05-19 10:05:02 +02:00
Laurent Destailleur
ee73a91c77
Merge pull request #5218 from atm-florian/develop
...
Fix : Advanced Accountancy module
2016-05-18 20:22:07 +02:00
Laurent Destailleur
89d37ccc62
Fix translation
2016-05-17 21:55:39 +02:00
Laurent Destailleur
7bbb3a7da1
Supplier proposal was missing
2016-05-17 19:34:23 +02:00
Laurent Destailleur
e2d3f4e27d
Supplier proposal was missing
2016-05-17 19:15:44 +02:00
Laurent Destailleur
79be93d998
FIX The table llx_product_lot is now filled/used to store eatby/sellby
...
dates.
2016-05-17 18:19:36 +02:00
florian HENRY
a45680dc19
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2016-05-17 08:37:22 +02:00
Laurent Destailleur
1973f67d41
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-05-17 01:11:14 +02:00
Laurent Destailleur
3a28935da3
Merge remote-tracking branch 'origin/3.9' into develop
2016-05-17 01:10:22 +02:00
florian HENRY
b8d452596c
Fix : Advanced Accountancy module
2016-05-16 16:37:07 +02:00
Alexis Algoud
8d0e5479a0
Rename var
2016-05-14 19:22:27 +02:00
Alexis Algoud
e74e70287f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_decrease_stock_expedition_classify
...
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/product/stock/replenish.php
2016-05-14 19:14:39 +02:00
Laurent Destailleur
cba0ef5693
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2016-05-14 00:44:38 +02:00
philippe grand
cd801fe1dd
Merge remote-tracking branch 'upstream/develop' into develop
2016-05-13 14:51:07 +02:00
Laurent Destailleur
55e904bc01
Debug for expert accounting module
2016-05-12 20:45:05 +02:00
Laurent Destailleur
a83a291856
Translation for one char
2016-05-12 19:55:36 +02:00
Laurent Destailleur
ab6fbb1bca
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-05-09 19:37:58 +02:00
Laurent Destailleur
a8f50283c0
Fix bad translation
2016-05-09 19:37:14 +02:00
Laurent Destailleur
9d3ad36b78
NEW If error is reported during migration process, you can ignore it to
...
avoid to be locked.
2016-05-09 11:06:18 +02:00
Laurent Destailleur
1835caad7b
Better translation
2016-05-09 08:53:09 +02:00
philippe grand
e8bd56a0d7
add new translation
2016-05-08 15:53:01 +02:00
Laurent Destailleur
6bb269381a
Merge pull request #5143 from frederic34/morecateg
...
categories account like other categories
2016-05-07 20:25:17 +02:00
Laurent Destailleur
5bee176ff8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-05-07 17:12:43 +02:00
Laurent Destailleur
82745d32df
NEW Survey system has now a status like other objects. You can close or
...
reopen a survey.
2016-05-07 17:12:31 +02:00
Laurent Destailleur
25dfa0c5b9
Work on website
2016-05-07 16:38:32 +02:00
Juanjo Menent
156a5349c1
Merge pull request #5171 from atm-ph/fix_develop_delete_buy_price
...
Fix no confirm window if we delete buying price
2016-05-07 00:46:05 +02:00
Laurent Destailleur
91d300289f
Minor fix in presentation
2016-05-06 12:15:44 +02:00
phf
0d03360375
Fix no confirm window if we delete buying price
2016-05-06 09:24:10 +02:00
Laurent Destailleur
cdbbe8d87b
Minor fixes
2016-05-05 23:44:44 +02:00
Laurent Destailleur
2960fb6df7
FIX Option not tested everywhere
2016-05-05 23:28:22 +02:00
Laurent Destailleur
aa55cdadac
Merge pull request #4944 from FHenry/develop_advtargetemailiing
...
NEW : Advance target emailing
2016-05-05 23:18:27 +02:00
