aspangaro
48006cb42d
Correct
2014-08-11 13:27:27 +02:00
aspangaro
0738103da8
Renamed llx_c_pays to llx_c_country & field "libelle" to "label"
2014-08-10 13:37:39 +02:00
KreizIT
c94c0699d8
Fix : [ bug #1549 ] Itïs not possible add ExtraFields
2014-08-06 17:38:44 +02:00
Laurent Destailleur
bb8ec0c8f9
Fix: Too many parameter
2014-08-01 14:26:13 +02:00
Laurent Destailleur
c895c892a5
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
2014-07-29 01:17:00 +02:00
Laurent Destailleur
db091896a5
Prepare 3.6.
...
Use google adsense tag of foundation for doxygen doc pages.
Version is no more encoded int odoxygen.
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/facture/impayees.php
htdocs/filefunc.inc.php
2014-07-26 18:10:51 +02:00
Laurent Destailleur
45435b597e
Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne
...
s'appliquent pas
2014-07-26 17:18:19 +02:00
Laurent Destailleur
5572364d2b
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
dev/codesniffer/ruleset.xml
2014-07-20 16:09:42 +02:00
Laurent Destailleur
8d46b02d67
Fix: missing property
2014-07-20 15:58:05 +02:00
Laurent Destailleur
bf926cd791
Merge pull request #1756 from marcosgdf/messages
...
Migrated old message notifications to the """new""" system
2014-07-20 04:57:09 +02:00
Marcos García de La Fuente
4f4ac30fc0
Deprecating arbitrary use of dol_htmloutput* functions
2014-07-20 02:32:13 +02:00
Marcos García de La Fuente
43597c1731
Migrated old error notifications to the """new""" system
2014-07-20 01:43:46 +02:00
Marcos García de La Fuente
ac824728bc
Migrated old error notifications to the """new""" system
2014-07-20 01:09:43 +02:00
Marcos García de La Fuente
434bb1bec7
Migrated old message notifications to the """new""" system
2014-07-20 00:10:40 +02:00
Laurent Destailleur
a6992e116b
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
2014-07-18 23:24:39 +02:00
Laurent Destailleur
44e57ca08a
Fix: Seach on company was not working
2014-07-18 18:21:09 +02:00
Marcos García de La Fuente
ec661d0c6c
Removed index.php and replaced them with blank index.html as it is more appropriate
2014-07-12 23:18:57 +02:00
Raphaël Doursenaud
f6848e8655
Add label on search boxes
2014-07-11 13:26:02 +02:00
Laurent Destailleur
be4fe3d0d0
Merge branch 'syslog' of github.com:marcosgdf/dolibarr into
...
marcosgdf-syslog
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/projet/class/project.class.php
htdocs/projet/class/task.class.php
2014-07-04 13:43:50 +02:00
KreizIT
685b7b23ad
FIX: Member's trigger problem
2014-07-03 15:09:46 +02:00
Marcos García de La Fuente
460fb7a453
Removed new SQL double-debug
2014-07-02 21:29:07 +02:00
Marcos García de La Fuente
7e1cf124b8
Merge branch 'develop' into syslog
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/product/class/product.class.php
htdocs/product/stock/lib/replenishment.lib.php
htdocs/societe/soc.php
2014-07-02 21:20:02 +02:00
Laurent Destailleur
71ee974ddb
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2014-06-28 14:53:28 +02:00
Laurent Destailleur
18838ccfa0
Fix: Correct name for thirdparty created from member.
2014-06-28 01:53:56 +02:00
Laurent Destailleur
3791175536
Fix: doxygen
2014-06-20 13:07:15 +02:00
Marcos García de La Fuente
56abf1cd72
Removed duplicated SQL error logging
2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +02:00
Laurent Destailleur
45161172e8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-05-26 16:52:24 +02:00
Laurent Destailleur
4880aac45f
Fix: Regression
2014-05-26 15:24:01 +02:00
Raphaël Doursenaud
c48c3a9d91
Qual: remove PHP closing tag (again)
...
These were reintroduced by careless merge
2014-05-26 13:51:25 +02:00
Laurent Destailleur
93f1392e87
Fix: Bugs reported by scrutinizer
2014-05-26 09:07:18 +02:00
Laurent Destailleur
64f8dcf131
Fix: Bad syntax of vars
2014-05-12 12:10:52 +02:00
Laurent Destailleur
a127f09377
- New: Paypal/paybox email sent after backcall of a payment is now a
...
formated and translated HTML content. For member subscription
renewal, there is also a link to member.
- New: When a subscription is recorded with invoice and payment: the
document (PDF) of invoice is also generated and the invoice is set
to status paid.
2014-05-07 10:33:10 +02:00
Laurent Destailleur
9f795331f5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/charges.php
htdocs/core/db/mysql.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
2014-05-06 23:58:17 +02:00
Laurent Destailleur
fe43d10c79
Fix: [ bug #1360 ] note indicator for member tab.
2014-05-06 23:42:19 +02:00
Laurent Destailleur
33ac8cc5f3
Qual: uniformize code for propertie dateh (removed dateadh), for class
...
Cotisation.
2014-05-05 00:42:52 +02:00
Laurent Destailleur
63100c9c06
Properties "civilite_id" were renamed into "civility_id".
2014-05-05 00:23:09 +02:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
e1d30837e9
Try to remove a warning
2014-05-03 03:10:58 +02:00
Laurent Destailleur
ada08986cf
Fix: strict
2014-05-03 03:05:48 +02:00
Laurent Destailleur
c02fbcf293
Clean code.
2014-05-03 02:57:46 +02:00
Laurent Destailleur
19d71ffb38
Prepare fix to hide images generated by "preview" feature.
2014-04-29 21:14:55 +02:00
Laurent Destailleur
c08c900602
Fix: amount is not a type
2014-04-28 12:17:25 +02:00
Laurent Destailleur
e5012a1670
Fix: Bad parameter type
2014-04-28 04:27:49 +02:00
Laurent Destailleur
2bd8da4e70
Missing property
2014-04-25 20:36:13 +02:00
Laurent Destailleur
298da30200
New: Extrafields can be used as substitution key %EXTRA_XXX% into emails
...
texts for members.
2014-04-25 14:39:34 +02:00
Laurent Destailleur
5d30220bf1
Merge pull request #1530 from squarou/develop
...
Add region tab for stats in adhrent
2014-04-13 02:04:02 +02:00
Laurent Destailleur
1b02cdd352
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
dev/initdata/mysqldump_dolibarr_3.5.0.sql
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/product/index.php
htdocs/user/fiche.php
2014-04-12 00:53:25 +02:00
squarou
247b14afac
Add region stats and tab
...
Added ($mode == 'memberbystate')
2014-04-10 22:13:59 +02:00
Laurent Destailleur
13659b1528
Fix: [ bug #1334 ] filter lost when sorting into list of memebers.
2014-04-09 00:12:07 +02:00
