Laurent Destailleur
9c8d69eaa9
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
2016-02-19 04:46:11 +01:00
Laurent Destailleur
4d0b9946f5
FIX Maxi serious problem when updating prices and vat of a product. All
...
mode (one price, price per level, ...) were impacted. Localtax setup
were lost.
2016-02-19 02:41:00 +01:00
Laurent Destailleur
7aaae143fc
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/expedition/card.php
2016-02-15 02:01:58 +01:00
Laurent Destailleur
3bcc7b0f8f
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/comm/remise.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/filefunc.inc.php
htdocs/societe/price.php
2016-02-15 01:37:23 +01:00
gauthier
756b50b9d3
FIX : search product in customer product prices doesn't work
2016-02-12 12:06:23 +01:00
Laurent Destailleur
cc4c5873e6
Fix sql error
2016-01-10 12:37:48 +01:00
Laurent Destailleur
3f506552e3
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/theme/md_exp/style.css.php
2015-09-27 21:29:16 +02:00
Raphaël Doursenaud
67ddb6c94e
[Qual] Cleanup of inherited class properties
2015-09-24 20:12:55 +02:00
Laurent Destailleur
3ee5920947
Merge pull request #3571 from fmarcet/3.8
...
FIX: When filter with empty status, by default get canceled status (-1)
2015-09-24 18:40:06 +02:00
Florian HENRY
84fa92045c
FIX : avoid SQL error when no sortfield send to method
2015-09-23 12:10:38 +02:00
fmarcet
3ff8b3e437
FIX: Error retrieving customer prices
2015-09-23 10:23:29 +02:00
Laurent Destailleur
11c94a9d3b
Clean code
2015-07-12 16:50:27 +02:00
Laurent Destailleur
41a74c62e2
Fix trigger to insert lines where called when inserting line but also
...
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
2015-02-26 13:03:17 +01:00
Marcos García de La Fuente
56abf1cd72
Removed duplicated SQL error logging
2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
0ed2481a20
Removed unuseful errors
2014-06-13 01:46:27 +02:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Florian Henry
4cbdf32ae6
codesniffer
2014-02-23 17:21:26 +01:00
Florian Henry
46ae5d6e9c
- New: Price management enhancement (multiprice level, price by
...
customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
- Fix: Project Task numbering rule customs rule works
2014-02-23 16:16:47 +01:00
