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 |
|
jean
|
8006edc278
|
correct issue 2589 getting user signature in script, when user is sended
through a script parameter
|
2015-04-18 16:39:53 +02:00 |
|
Marcos García de La Fuente
|
d1f73499e9
|
Refactored dashboard indicator
|
2015-02-15 15:01:28 +01:00 |
|
Laurent Destailleur
|
e3885d6d73
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/core/lib/tax.lib.php
|
2015-02-10 21:36:38 +01:00 |
|
Laurent Destailleur
|
ddb95e5765
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/comm/mailing/fiche.php
htdocs/compta/paiement/liste.php
htdocs/contact/class/contact.class.php
htdocs/core/lib/tax.lib.php
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/langs/en_US/agenda.lang
htdocs/webservices/server_contact.php
|
2015-02-10 21:33:43 +01:00 |
|
Laurent Destailleur
|
449f2b9346
|
Merge branch 'delay-emailing' of https://github.com/marcosgdf/dolibarr
into marcosgdf-delay-emailing
Conflicts:
htdocs/comm/mailing/card.php
|
2015-01-21 00:05:19 +01:00 |
|
Laurent Destailleur
|
e220ce5a82
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/comm/card.php
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/html.formcompany.class.php
htdocs/custom/.gitignore
htdocs/expedition/card.php
htdocs/fourn/card.php
htdocs/product/fournisseurs.php
|
2015-01-18 18:44:22 +01:00 |
|
Laurent Destailleur
|
5c5ff72ecd
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
ChangeLog
htdocs/adherents/fiche.php
htdocs/comm/fiche.php
htdocs/comm/mailing/fiche.php
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/paiement.php
htdocs/core/class/html.formcompany.class.php
htdocs/core/tpl/login.tpl.php
htdocs/expedition/fiche.php
htdocs/fourn/commande/fiche.php
htdocs/fourn/facture/fiche.php
htdocs/fourn/facture/paiement.php
htdocs/fourn/fiche.php
htdocs/main.inc.php
htdocs/product/fournisseurs.php
htdocs/resource/card.php
|
2015-01-18 17:13:42 +01:00 |
|
Marcos García de La Fuente
|
fb186d6ef8
|
Added delay between mails in Newsletter module
|
2015-01-18 16:26:26 +01:00 |
|
Laurent Destailleur
|
01209ff844
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/product/stock/card.php
|
2014-11-30 14:15:38 +01:00 |
|
Laurent Destailleur
|
3fe2db6c8d
|
Try to find a solution to fight against spam sending from dolibarr when
phpmail is set.
No time to find a better solution so i add just a hidden option to
disable phpmail function.
|
2014-11-29 13:50:41 +01:00 |
|
aspangaro
|
c4c69e191b
|
Replace <center> tags
|
2014-11-25 20:13:43 +01:00 |
|
Regis Houssin
|
a2446e51db
|
New: add context "globalcard" for declaring only once all cards
|
2014-10-06 07:20:58 +02:00 |
|
Laurent Destailleur
|
ec95aacd52
|
Uniformize code for error reporting after a hook.
|
2014-09-28 03:41:32 +02:00 |
|
aspangaro
|
0b20369dd7
|
Qual: Renamed all files & links "fiche.php" into "card.php"
|
2014-09-18 21:18:25 +02:00 |
|