philippe grand
|
eaf0fda6aa
|
fix syntax errors
|
2015-04-18 18:07:41 +02:00 |
|
Laurent Destailleur
|
ef14e4e7ed
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/compta/facture.php
htdocs/fourn/class/fournisseur.product.class.php
|
2015-02-28 03:11:15 +01:00 |
|
Laurent Destailleur
|
4bde7e9f51
|
Fix: Missing error management
|
2015-02-26 14:25:30 +01:00 |
|
Laurent Destailleur
|
e3713c8b6d
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
|
2015-02-19 00:01:26 +01:00 |
|
Marcos García de La Fuente
|
157a6e109e
|
Misc Adherents PHPDoc corrections
|
2015-02-10 10:45:48 +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 |
|
aspangaro
|
c4c69e191b
|
Replace <center> tags
|
2014-11-25 20:13:43 +01:00 |
|
Laurent Destailleur
|
671243e8f6
|
Fixed: Bugs reported by scrutinizer
Fixed: Solve conflict between ->iban and ->iban_prefix.
|
2014-11-22 16:57:08 +01:00 |
|
Laurent Destailleur
|
ad661256c0
|
Fix: Bugs reported by scrutinizer
|
2014-11-15 16:20:03 +01:00 |
|
Laurent Destailleur
|
5e0946bdc2
|
Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/adherents/fiche.php
htdocs/core/lib/date.lib.php
htdocs/langs/fr_FR/bills.lang
htdocs/resource/class/resource.class.php
|
2014-11-05 16:37:07 +01:00 |
|
Regis Houssin
|
a2446e51db
|
New: add context "globalcard" for declaring only once all cards
|
2014-10-06 07:20:58 +02:00 |
|
Xebax
|
11b3b94e6f
|
Fix bug #1604: When a member is created, the birthday is not recorded.
|
2014-09-30 01:37:36 +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 |
|