Marcos García de La Fuente
|
023175b9f1
|
PHPDoc and misc fixes for several folders
|
2015-02-10 11:38:13 +01:00 |
|
Laurent Destailleur
|
ad68b3ca6c
|
Fixed approve during validation if user has permission
Fixed error management
Fixed rendering country must be same for all tabs.
|
2015-01-25 00:59:46 +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 |
|
Laurent Destailleur
|
657fc1b91c
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
ChangeLog
htdocs/comm/fiche.php
htdocs/core/lib/functions2.lib.php
htdocs/fourn/fiche.php
htdocs/langs/fr_FR/compta.lang
htdocs/projet/element.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/time.php
|
2014-12-26 04:44:15 +01:00 |
|
Laurent Destailleur
|
bff65fc6b4
|
Fix: starting with var with always same color
|
2014-12-05 01:25:18 +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
|
1592968709
|
Merge remote-tracking branch 'Upstream/develop' into develop
|
2014-09-20 06:42:31 +02:00 |
|
aspangaro
|
0b20369dd7
|
Qual: Renamed all files & links "fiche.php" into "card.php"
|
2014-09-18 21:18:25 +02:00 |
|