Laurent Destailleur
|
9768550696
|
Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
ChangeLog
htdocs/categories/fiche.php
htdocs/comm/action/index.php
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fourn/fiche.php
htdocs/product/composition/fiche.php
htdocs/product/price.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
|
2014-10-12 02:54:34 +02:00 |
|
Regis Houssin
|
a2446e51db
|
New: add context "globalcard" for declaring only once all cards
|
2014-10-06 07:20:58 +02:00 |
|
Florian HENRY
|
46f673fb5f
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/fourn/card.php
|
2014-09-29 16:01:49 +02:00 |
|
Laurent Destailleur
|
ba33f73767
|
Merge pull request #1925 from tiaris/develop
adding hooks for supplier card and order card
|
2014-09-29 15:40:31 +02:00 |
|
Florian HENRY
|
ce145cc056
|
Add cache excel export on harddrive with
MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR const. It can avoid lot's of stack
overflow on large excel export
|
2014-09-29 10:16:48 +02:00 |
|
Laurent Destailleur
|
ec95aacd52
|
Uniformize code for error reporting after a hook.
|
2014-09-28 03:41:32 +02:00 |
|
jean
|
6149994b43
|
Adding hook 'suppliercard' on supplier cartd
|
2014-09-24 22:05:53 +02:00 |
|
Florian HENRY
|
518d23f278
|
Add feature to order to invoice on supplier part
|
2014-09-23 16:28:29 +02:00 |
|
aspangaro
|
0b20369dd7
|
Qual: Renamed all files & links "fiche.php" into "card.php"
|
2014-09-18 21:18:25 +02:00 |
|