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
philippe
8dc23025ed
anglicized
2014-04-06 16:06:54 +02:00
Grand Philippe
3734c4de0b
Merge branch 'develop' into debug
2014-04-06 15:59:03 +02:00
Laurent Destailleur
d595b96c8e
New: Paypal return for subscription show more information and direct
...
link into email.
Qual: Better management of error when creating subscription of member
not linked to a third party.
2014-04-06 14:22:08 +02:00
philippe
43c85cc446
anglicized
2014-04-05 17:14:57 +02:00
Laurent Destailleur
cafa61ef7d
Fix: Use correct syntax of date into sql requests (with quotes)
2014-03-15 23:12:00 +01:00
Laurent Destailleur
1b85f83dbb
Merge pull request #1466 from marcosgdf/minor
...
Minor style and translation corrections
2014-03-13 11:53:52 +01:00
Marcos García de La Fuente
54b9f72977
Unified module name in members admin page and added spacing before submit button
2014-03-11 11:31:37 +01:00
Laurent Destailleur
a453d24eea
Merge pull request #1437 from marcosgdf/invoice-types
...
Replacing invoice integer types with Facture and FactureFournisseur constants
2014-02-27 11:11:19 +01:00
Laurent Destailleur
f7fe25e408
Uniformize code to prepare mass update
2014-02-27 10:37:23 +01:00
Marcos García de La Fuente
ad928cb443
Replacing invoice integer types with Facture constants
2014-02-26 00:56:36 +01:00
Grand Philippe
1855ba556a
fix misspelled words
2014-02-05 17:53:30 +01:00
Laurent Destailleur
9e7f3686db
Fix: No message if module mailman disabled
2014-01-23 09:19:56 +01:00
Laurent Destailleur
82bc9e709b
Fix: No message if module mailman disabled
2014-01-23 08:54:39 +01:00
Laurent Destailleur
8cdd0502b7
Fix: Syntax error
2014-01-21 15:27:32 +01:00
Laurent Destailleur
e85cf332b3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-01-20 17:34:40 +01:00
Laurent Destailleur
30aae38efa
Removed POST usage.
2014-01-20 14:23:37 +01:00
Grand Philippe
c5689b86b4
Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1
2014-01-13 09:43:21 +01:00
Laurent Destailleur
5a4b5dcc26
Fix: Missing condition
2013-12-14 14:21:27 +01:00
Laurent Destailleur
0383dc4706
Fix: 2 bugs during validation of a member
2013-11-26 13:10:00 +01:00
