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
|
6f474c403c
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/societe/notify/card.php
htdocs/societe/price.php
|
2015-12-27 19:15:20 +01:00 |
|
Laurent Destailleur
|
2d3915b88c
|
Fix hook implementation on some thirdparty pages
|
2015-12-23 14:31:42 +01:00 |
|
philippe grand
|
8e8c6b1534
|
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
|
2015-12-21 14:22:45 +01:00 |
|
Laurent Destailleur
|
db7a98f0ef
|
Fix: When a payment mode was disabled, it was not visible on old
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
|
2015-12-21 13:56:59 +01:00 |
|
philippe grand
|
7a33e2983d
|
[Qual] Uniformize code
|
2015-12-20 10:36:20 +01:00 |
|
Laurent Destailleur
|
9973315a07
|
Fix we muste have ($limit = $conf->liste_limite; $offset = $limit *
$page) and not ($offset = $conf->liste_limite * $page).
In a future $limit that could be overwrite from search post form.
|
2015-12-16 19:38:40 +01:00 |
|
Laurent Destailleur
|
e26940ddf7
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/core/lib/admin.lib.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/install/filelist.xml
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
htdocs/societe/price.php
|
2015-11-05 01:50:30 +01:00 |
|
Laurent Destailleur
|
74be7bf334
|
FIX Filter in customer price per product of a thirdparty returned error
|
2015-11-03 11:40:06 +01:00 |
|
Laurent Destailleur
|
5181afd49d
|
Disable dead code
|
2015-10-24 19:29:41 +02:00 |
|
Laurent Destailleur
|
3015a0388a
|
NEW List of projects of a thirdparty are visible on a project tab
|
2015-10-24 16:09:26 +02:00 |
|
Laurent Destailleur
|
531ef43a27
|
Some minor look fixes.
|
2015-10-22 19:13:16 +02:00 |
|
Laurent Destailleur
|
a84ec64ece
|
The new banner tab is available on all tabs of thirdparty.
|
2015-10-13 13:06:32 +02:00 |
|
Raphaël Doursenaud
|
631ee83745
|
[Qual] Replaced deprecated print_fiche_titre()
|
2015-09-24 18:34:58 +02:00 |
|
Laurent Destailleur
|
a3a5b0d9b0
|
Upgrade jquery and jquery-ui to last stable version
|
2015-06-21 00:06:37 +02:00 |
|
Laurent Destailleur
|
825369230f
|
Finishment of look
|
2015-06-20 23:33:13 +02:00 |
|
Laurent Destailleur
|
fb1a3f3ea3
|
Rename alternative name
|
2015-06-16 12:04:11 +02:00 |
|
Marcos García de La Fuente
|
a496606826
|
Merge branch 'develop' into commercial-name
Conflicts:
htdocs/societe/soc.php
|
2015-06-13 02:45:42 +02:00 |
|
Laurent Destailleur
|
89f77f5e2b
|
Uniformize code
|
2015-06-06 14:21:18 +02:00 |
|
Marcos García de La Fuente
|
2ba795fcbc
|
NEW: [ task #851 ] Add a new field: Commercial name
|
2015-02-28 14:30:06 +01:00 |
|
aspangaro
|
ef991e6c5d
|
HTML5 - <center> is deprecated - Need CSS - continue working
|
2014-11-24 06:43:15 +01:00 |
|
Laurent Destailleur
|
342e26f679
|
Merge
|
2014-09-07 12:22:04 +02:00 |
|
Laurent Destailleur
|
64f8dcf131
|
Fix: Bad syntax of vars
|
2014-05-12 12:10:52 +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
|
d242f4930d
|
php codesniffer
|
2014-02-23 17:01:51 +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 |
|