Laurent Destailleur
4a1dfa60a5
Uniformize code
2015-06-30 13:14:19 +02:00
Laurent Destailleur
ae5b779652
Uniformize code
2015-06-30 01:34:17 +02:00
Regis Houssin
e3d1614004
Fix: ereg more simple
2015-06-11 09:21:44 +02:00
Regis Houssin
14780747fc
Merge remote-tracking branch 'dolibarr/3.7' into 3.7
2015-06-10 16:00:42 +02:00
Laurent Destailleur
9b7982bf0c
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/fourn/facture/card.php
htdocs/theme/eldy/style.css.php
2015-06-08 18:28:50 +02:00
Regis Houssin
8d824785f0
Merge remote-tracking branch 'dolibarr/3.7' into 3.7
2015-06-08 10:03:34 +02:00
Laurent Destailleur
02dbe16366
Mutualize code to show block to link an element to another one.
2015-06-06 15:57:59 +02:00
Regis Houssin
9a812a6c28
Fix: add filter for "dol_most_recent_files" for avoid conflict with
...
option "Save file on server with name "FA0700034-Original filename""
2015-06-06 13:03:02 +02:00
Laurent Destailleur
f42065146a
Start to clean html.form class.
2015-06-06 12:26:47 +02:00
Laurent Destailleur
43ed48896a
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/debian/changelog
htdocs/filefunc.inc.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2015-06-05 18:31:53 +02:00
Laurent Destailleur
1252a500ce
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/fourn/class/fournisseur.product.class.php
2015-06-05 16:50:46 +02:00
Regis Houssin
5139954365
Fix: add filter in "dol_most_recent_files" for avoid conflict with
...
option "Save file on server with name "FA0700034_Original filename""
2015-06-04 16:39:39 +02:00
Laurent Destailleur
f437bd2d6d
FIX No check warehouse is provided if module stock is not enabled.
2015-06-03 21:21:20 +02:00
Florian HENRY
fb29fa486a
FIX : total amount in tpl linked object are not reset
2015-06-02 11:20:08 +02:00
Raphaël Doursenaud
3f9270ea78
Qual: added deprecation hinting
...
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Laurent Destailleur
03acb1a8c9
Uniformize way to report error after "buildoc" action.
2015-05-19 00:01:30 +02:00
Laurent Destailleur
a258370f8a
Prepare code for generic solution where all path are forged using
...
get_exdir.
2015-05-18 22:25:51 +02:00
Laurent Destailleur
fe3f701928
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
htdocs/expedition/list.php
htdocs/filefunc.inc.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/user/class/user.class.php
2015-05-16 17:09:42 +02:00
Laurent Destailleur
976211b70f
Look enhancement
2015-05-15 12:53:14 +02:00
Maxime Kohlhaas
942564be56
Fix : bad link when sorting shipment list #2823
2015-05-12 22:36:34 +02:00
Raphaël Doursenaud
aee61aa2c4
[Qual] Fixed deprecated HTML nowrap attribute to class
2015-05-12 15:37:35 +02:00
Laurent Destailleur
a93ba86ce0
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/expedition/modules_expedition.php
htdocs/core/modules/modContrat.class.php
htdocs/expedition/class/expedition.class.php
2015-05-07 13:35:09 +02:00
Laurent Destailleur
afc487ef9d
Fix phpcs
2015-05-07 13:28:03 +02:00
Juanjo Menent
f993920d67
Commenting function
2015-05-07 13:23:00 +02:00
Laurent Destailleur
b71e5a1025
Merge pull request #2673 from aternatik/fix_getentity
...
Fix : missing getEntity calls
2015-05-07 00:48:19 +02:00
Juanjo Menent
652ff9e67c
Commenting function
2015-05-06 23:13:33 +02:00
Maxime Kohlhaas
1cb7d284a5
Fix : shipment PDF was not using generation params
...
Conflicts:
htdocs/core/modules/expedition/modules_expedition.php
htdocs/expedition/fiche.php
2015-05-06 21:29:58 +02:00
Maxime Kohlhaas
72c4337f4b
Fix : shipment PDF was not using generation params
...
Conflicts:
htdocs/core/modules/expedition/modules_expedition.php
htdocs/expedition/fiche.php
2015-05-06 21:18:31 +02:00
Maxime Kohlhaas
d2603d5308
Fix : shipment was not considered as billed after classifybilled function
2015-05-06 12:39:10 +02:00
Maxime Kohlhaas
b203263e91
Fix : shipment PDF was not using generation params
2015-05-06 12:16:36 +02:00
Laurent Destailleur
100fa1067e
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/bank/virement.php
htdocs/compta/facture/impayees.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/modProjet.class.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/langs/en_GB/admin.lang
htdocs/langs/es_AR/orders.lang
htdocs/langs/es_AR/trips.lang
htdocs/langs/es_CO/admin.lang
htdocs/langs/es_CO/orders.lang
htdocs/langs/es_CO/trips.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/pl_PL/interventions.lang
htdocs/langs/pt_BR/trips.lang
htdocs/langs/ro_RO/productbatch.lang
htdocs/langs/ro_RO/trips.lang
htdocs/main.inc.php
htdocs/projet/element.php
2015-04-22 17:57:57 +02:00
jfefe
f5db4d5bb7
Fix: missing getEntity function
2015-04-19 03:05:37 +02:00
Laurent Destailleur
5b29c87933
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/deplacement/fiche.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/expedition/fiche.php
2015-04-19 00:23:46 +02:00
Laurent Destailleur
ab77158757
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/expedition/fiche.php
2015-04-18 23:55:17 +02:00
Florian HENRY
f2018b7946
fix bug #2652
2015-04-18 22:59:20 +02:00
Marcos García de La Fuente
e2e6049c7f
Copyright
2015-04-18 20:50:03 +02:00
Marcos García de La Fuente
c07e26dcac
Merge branch 'develop' into fr-2613
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-04-18 20:42:57 +02:00
Marcos García de La Fuente
dc790ff586
NEW: Feature request: A page to merge two thirdparties into one #2613
2015-04-18 20:41:09 +02:00
Florian HENRY
b7191a541c
All send email card works with model choice box
2015-04-18 17:15:36 +02:00
Maxime Kohlhaas
2b8efc302a
Fix : shipment model selection
2015-04-18 11:24:55 +02:00
Laurent Destailleur
deb62f1ffd
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/core/lib/ajax.lib.php
htdocs/expedition/list.php
2015-04-18 04:18:59 +02:00
Maxime Kohlhaas
73a66f789c
New : shipment lists by status
2015-04-18 01:21:22 +02:00
Maxime Kohlhaas
1ad610130a
Fix : shipment list sql request and delivery display
2015-04-18 01:09:16 +02:00
Laurent Destailleur
1d6a8a46f1
To clean an int we must use (int) and not trim()
2015-04-07 02:44:30 +02:00
Laurent Destailleur
cf0f458a51
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
htdocs/langs/el_GR/projects.lang
htdocs/langs/en_GB/bills.lang
htdocs/langs/en_GB/main.lang
htdocs/langs/en_GB/orders.lang
htdocs/langs/es_AR/bills.lang
htdocs/langs/es_CO/admin.lang
htdocs/langs/es_CO/main.lang
htdocs/langs/es_ES/bills.lang
htdocs/langs/es_ES/projects.lang
htdocs/langs/fa_IR/categories.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/other.lang
htdocs/langs/fr_FR/projects.lang
htdocs/langs/lv_LV/bills.lang
htdocs/langs/nb_NO/bills.lang
htdocs/langs/pl_PL/bills.lang
htdocs/langs/pl_PL/mails.lang
htdocs/langs/pl_PL/projects.lang
htdocs/langs/ro_RO/bills.lang
htdocs/langs/ro_RO/products.lang
htdocs/langs/ro_RO/projects.lang
htdocs/langs/ru_RU/bills.lang
htdocs/langs/ru_RU/projects.lang
htdocs/langs/sl_SI/main.lang
htdocs/langs/tr_TR/bills.lang
htdocs/langs/tr_TR/projects.lang
htdocs/langs/vi_VN/bills.lang
2015-04-02 13:57:20 +02:00
Laurent Destailleur
f89d74d6bc
Deletion of dir was not complete.
2015-04-02 11:44:43 +02:00
Marcos García de La Fuente
cc1d298f29
Merge branch 'develop' into constants
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture/class/facture.class.php
2015-03-30 02:36:46 +02:00
Laurent Destailleur
6ceda02eaa
NEW: Enhancement of module 'Notification by Email'. Show nb of
...
notifications set. Can set several emails. Can set a threshold on
amount for notifications. Add notification on supplier order validation.
2015-03-18 21:44:57 +01:00
Marcos García de La Fuente
094538c07b
Implemented constants in Commande, Facture and Propal
2015-03-15 11:48:57 +01:00
Laurent Destailleur
0b74ddf5c3
Doxygen
2015-03-10 14:23:40 +01:00
