Juanjo Menent
99a28a9dcd
Fix Travis error introduced in commit '236ecf01'
2016-06-03 16:15:27 +02:00
Sebastien Bechet
be5eb42a46
Merge remote-tracking branch 'upstream/develop' into develop
2016-06-03 16:15:12 +02:00
Sebastien Bechet
7f98b1ceff
Regression
2016-06-03 10:21:37 +02:00
Laurent Destailleur
a5d7c303e7
FIX Button must be out of tabs
2016-06-02 21:11:14 +02:00
Laurent Destailleur
ebd8f2cf86
Prepare 4.0
2016-06-02 13:33:22 +02:00
Laurent Destailleur
6062bad917
Update doc
2016-06-02 13:29:51 +02:00
Laurent Destailleur
ea0927ee9d
ChangeLog of 4.0 is ready
2016-06-02 13:28:09 +02:00
Laurent Destailleur
6feabe5049
ChangeLog of 4.0 is ready
2016-06-02 13:27:18 +02:00
Maxime Kohlhaas
ab44adc6d5
Fix SQL error on order stats
2016-06-02 12:37:37 +02:00
Laurent Destailleur
f07559a784
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-06-02 11:44:19 +02:00
Frédéric FRANCE
19f6aa805b
select engine for code 128 didn't work
2016-06-02 11:41:26 +02:00
Laurent Destailleur
0f53993c6f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-06-02 11:24:24 +02:00
Laurent Destailleur
79cee4b8fb
git push origin developMerge branch 'atm-alexis-develop_NEW_decrease_stock_expedition_classify' into develop
2016-06-02 11:24:03 +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
b8ee75ce23
Merge pull request #5248 from IonAgorria/patch-2
...
Fix: Fill ref_supplier in product get_buyprice
2016-06-02 10:06:17 +02:00
Laurent Destailleur
f40f5e28ad
Merge pull request #5254 from atm-florian/3.9_fix5209
...
FIX #5209
2016-06-02 10:05:37 +02:00
Laurent Destailleur
537c9637f6
Merge pull request #5255 from atm-florian/dev_fix5151
...
FIX : #5151
2016-06-02 10:05:02 +02:00
Laurent Destailleur
c663ca13b8
Fix edit left menu
2016-06-01 21:41:47 +02:00
Laurent Destailleur
780d1628a9
Missing trans
2016-06-01 21:19:21 +02:00
Laurent Destailleur
bf5fbd3a80
FIX Infinite loop on menu tree output for edition
...
FIX Can show tree of entries added by external modules using fk_mainmenu
and fk_leftmenu instead of fk_menu.
2016-06-01 21:14:28 +02:00
Laurent Destailleur
028ff5e84c
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/facture/card.php
htdocs/langs/en_US/products.lang
htdocs/societe/list.php
2016-06-01 17:59:50 +02:00
Laurent Destailleur
ee420b79b1
FIX Infinite loop on menu tree output for edition
...
FIX Can show tree of entries added by external modules using fk_mainmenu
and fk_leftmenu instead of fk_menu.
2016-06-01 17:52:06 +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
40005b8f65
FIX Missing search on barcode, only if defined
2016-06-01 12:15:54 +02:00
Juanjo Menent
7773afcbbe
Merge remote-tracking branch 'upstream/3.9' into 3.9
2016-06-01 10:36:18 +02:00
Florian HENRY
d17a879f33
add into migratino script
2016-05-31 23:32:21 +02:00
Florian HENRY
ed05321438
comment don't need to be updated
2016-05-31 23:24:35 +02:00
Florian HENRY
3c42a32690
FIX : #5151
2016-05-31 23:22:15 +02:00
Florian HENRY
41a41f8931
FIX #5209
2016-05-31 22:55:49 +02:00
Laurent Destailleur
79291b7a77
Prepare 4.0
2016-05-31 00:35:21 +02:00
Laurent Destailleur
cc68b885a3
Fix minor css errors
2016-05-30 22:39:26 +02:00
Laurent Destailleur
1bc6c4ffa3
Clean code
2016-05-30 20:50:49 +02:00
Laurent Destailleur
0d277083e6
Fix duplicate translation
2016-05-30 19:56:59 +02:00
Laurent Destailleur
58ba5838ce
Fix alias name already visible into banner
2016-05-30 19:41:28 +02:00
Laurent Destailleur
460d7ce915
FIX Split of credit note into discount page generates records not
...
correctly recognised as credit note.
2016-05-30 19:38:28 +02:00
Laurent Destailleur
89cb122474
Merge branch '3.9' of github.com:Dolibarr/dolibarr into 3.9
2016-05-30 18:15:19 +02:00
Laurent Destailleur
ed148f70b3
FIX Filter on assigned to was preselected on current user on list "All
...
events" (instead of no filtering)
2016-05-30 18:12:27 +02:00
Laurent Destailleur
3cc8207bb7
FIX Filter on category tag for suppliers
2016-05-30 17:20:34 +02:00
Laurent Destailleur
2290f6a123
FIX Menu statistics was not visible if module proposal was not enabled
2016-05-30 13:11:44 +02:00
Laurent Destailleur
46a0f3dab0
Fix minor bugs
2016-05-30 01:30:28 +02:00
Laurent Destailleur
2dcc578b88
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-05-30 00:52:59 +02:00
Laurent Destailleur
3ddf427ff1
FIX Legal issue for GB. Add hidden option for this.
2016-05-30 00:52:16 +02:00
Ion Agorria
ade417855b
Fill ref_supplier in product get_buyprice
2016-05-29 13:45:26 +02:00
Laurent Destailleur
4c93340de1
Merge pull request #5232 from atm-florian/develop
...
Add trigger into expedition class
2016-05-29 13:15:35 +02:00
Laurent Destailleur
a1a335025f
FIX #5230
2016-05-29 12:05:11 +02:00
Laurent Destailleur
c2d8bd99dc
Merge pull request #5244 from atm-gauthier/3.8_fix_mergepropal
...
FIX : same page added several times on mergepropal option
2016-05-29 12:03:35 +02:00
Laurent Destailleur
3f49f0df33
Merge pull request #5245 from atm-gauthier/3.8_fix_sql_error_on_facture_create
...
FIX : SQL error function on getAvailableDiscounts function, on bill c…
2016-05-29 11:58:28 +02:00
Laurent Destailleur
889ff16906
FIX #5239
2016-05-29 11:56:19 +02:00
Laurent Destailleur
d8c6ae0b17
Removed warnings
2016-05-29 11:26:05 +02:00
Laurent Destailleur
0b6bda910b
Removed scrutinizer warning
2016-05-29 11:23:32 +02:00
