Commit Graph

1209 Commits

Author SHA1 Message Date
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
Laurent Destailleur
628e8bea83 Fix: Missing error message when files were too large. 2013-11-23 15:22:27 +01:00
Laurent Destailleur
0e743d5024 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	ChangeLog
	htdocs/adherents/admin/adherent.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/document.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/facture/list.php
	htdocs/cron/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/commande/document.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cron.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/nl_NL/categories.lang
	htdocs/langs/nl_NL/commercial.lang
	htdocs/langs/nl_NL/companies.lang
	htdocs/langs/nl_NL/dict.lang
	htdocs/langs/nl_NL/main.lang
	htdocs/langs/nl_NL/margins.lang
	htdocs/langs/nl_NL/products.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/rib.php
2013-11-19 21:08:02 +01:00
Cédric Salvador
00c9df670c renamed templates 2013-11-06 10:22:01 +01:00
Cédric Salvador
70ae7b6686 facto 2013-11-06 10:20:11 +01:00
Cédric Salvador
23008c3b31 factorized document actions
Conflicts:
	htdocs/societe/document.php
2013-11-06 10:11:40 +01:00
Grand Philippe
a14de0c035 fix : language 2013-11-05 15:29:33 +01:00
aspangaro
d79ba9695a Task 157 : Add a skype button 2013-11-04 21:41:36 +01:00
Grand Philippe
c5f29e14a4 missing trad and fix language 2013-11-02 17:50:24 +01:00
Laurent Destailleur
e343d3bc6f Fix: missing property 2013-10-08 21:16:53 +02:00
Laurent Destailleur
eb10b2c5e9 Fix: missing property 2013-10-08 21:14:54 +02:00
Laurent Destailleur
065c87d81c Qual: uniformize code: property ->tel on objects is now ->phone
everywhere
2013-09-25 19:58:22 +02:00
Laurent Destailleur
3fde695c94 Qual: Uniformise name of include files we use to share common code found
into Actions area of pages (controllers).
2013-09-23 13:22:28 +02:00
Laurent Destailleur
dd0612099c Qual: Uniformize fields departement_id into state_id 2013-09-20 14:35:58 +02:00
Laurent Destailleur
c151ef7b87 Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
Laurent Destailleur
91718bc902 Qual: Replace deprecated call ->form_confirm with ->formconfirm 2013-09-06 11:51:24 +02:00
Laurent Destailleur
cb52af4f47 Qual: Make code more generic 2013-09-02 02:14:16 +02:00
Laurent Destailleur
9da5f7f47a Qual: Doxygen 2013-08-22 16:49:23 +02:00
Laurent Destailleur
c4bc10b8eb Qual: Clean code by moving synchro with mailman into mailman trigger
New: A trigger can return an array of error strings instead of one error
string.
2013-08-21 12:39:20 +02:00
Laurent Destailleur
8e5537f1ce New: Add trigger CATEGORY_LINK and CATEGORY_UNLINK. 2013-08-10 02:40:11 +02:00
Laurent Destailleur
afae841ae4 Fix: Permissions on files 2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe Fix: Permissions on files 2013-08-06 00:36:04 +02:00
Laurent Destailleur
67820774bb Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	ChangeLog
	htdocs/commande/fiche.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
2013-07-27 14:21:47 +02:00
Laurent Destailleur
3c6b1f17d1 Fix: print of a function that already contains the print. 2013-07-27 14:10:57 +02:00
Laurent Destailleur
9c88c03860 Fix: missing css class on tr 2013-07-25 13:56:07 +02:00
Laurent Destailleur
bf9b255c92 Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_opensuse.spec
2013-07-24 15:25:00 +02:00
Laurent Destailleur
644f5149e4 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/core/class/html.formfile.class.php
2013-07-24 00:42:28 +02:00
Laurent Destailleur
8f39d30ea5 Fix: Bad parameter 2013-07-23 18:22:10 +02:00
Laurent Destailleur
548ea4f93f Fix: Navigation 2013-07-10 23:58:49 +02:00
Laurent Destailleur
c98545010b Fix: Navigation 2013-07-10 23:57:18 +02:00
Laurent Destailleur
27a435994a Qual: Some methods object->addline used a first parameter that was
object->id, some not. Of course this was not a good pratice, since
object->id is already known so no need to provide it as parameter.
All methods addline in this case were modified to match good
pratice and be uniformed with others.
2013-07-10 17:29:54 +02:00
Laurent Destailleur
2bc650bf61 Qual: Remove tons of codesniffer errors and warnings. 2013-07-07 13:14:32 +02:00
Raphaël Doursenaud
a4fe6a40bf Fixed missing class include 2013-07-01 17:45:44 +02:00
Raphaël Doursenaud
b9ff5188b3 Normalized EOL 2013-07-01 12:00:42 +02:00
Laurent Destailleur
314d45a9ee Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/it_IT/admin.lang
	htdocs/langs/nb_NO/admin.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/pt_BR/admin.lang
	htdocs/langs/pt_PT/admin.lang
	htdocs/langs/sl_SI/admin.lang
	htdocs/langs/zh_TW/admin.lang
2013-06-28 00:52:09 +02:00
Laurent Destailleur
1223d7c3d0 Fix: Civility field must be blank if not defined. 2013-06-27 18:37:09 +02:00
Laurent Destailleur
c92aa1f6aa New: dol_strintotime accept format YYYY-MM-DD HH:MM:SS
Fix: create member was missing field import_key
New: Uniformize code
2013-06-27 17:45:58 +02:00
Laurent Destailleur
c590f6482e New: Can fetch from ref_ext and name 2013-06-27 14:23:56 +02:00
Laurent Destailleur
1d8b9949d6 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/compta/bank/categ.php
	htdocs/compta/bank/releve.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/contacts.tpl.php
	htdocs/cron/list.php
	htdocs/main.inc.php
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/theme/bureau2crea/style.css.php
	htdocs/theme/eldy/style.css.php
	htdocs/user/class/user.class.php
	htdocs/viewimage.php
2013-06-24 20:02:02 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Laurent Destailleur
9012c49299 Perf: Optimize class loading. Need 1 MB less of memory to load home
page.
2013-06-16 23:15:20 +02:00
Laurent Destailleur
c748f3d834 Qual: Removed useless methods
Qual: Removed deprecated vars
Qual: Free memory
2013-06-16 21:31:21 +02:00
Laurent Destailleur
02f1271fc4 New: Add option ADHERENT_LOGIN_NOT_REQUIRED 2013-06-14 01:30:43 +02:00
Laurent Destailleur
499440be16 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-14 01:29:43 +02:00
Laurent Destailleur
c1b21d1480 Fix: Option not working 2013-06-14 01:29:05 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
eac4aa7e28 New: Module mailman can subscribe/unsubscribe to ML according to
categories of member.
2013-06-05 15:44:42 +02:00
Laurent Destailleur
a34ab5a13f Look: Email at a better place 2013-06-04 23:19:04 +02:00
Laurent Destailleur
26ac8f9f28 Fix: Missing translation 2013-06-03 22:17:03 +02:00
Laurent Destailleur
4b0b6fdd55 Fix: Avoid pb with jmobile 2013-06-01 00:24:13 +02:00
Laurent Destailleur
361e291d2d Fix: Lang not loaded 2013-05-30 19:36:00 +02:00
Laurent Destailleur
2a96172294 Fix: Pb in synchro update 2013-05-25 18:12:00 +02:00
Laurent Destailleur
4fc1fe798c Fix: Bad check on mandatory parameters 2013-05-12 18:20:28 +02:00
Laurent Destailleur
df6c796413 Fix: [ bug #889 ] Titre civilité ne s'affiche 2013-05-12 17:09:48 +02:00
Laurent Destailleur
1e76911890 Fix: Not error when migrating from version using exotic menu manager.
Fix: Delete of member use id
2013-05-12 15:26:23 +02:00
fhenry
0a26be3f04 Fix security leak 2013-05-10 15:11:49 +02:00
fhenry
9427e32e2e Fix security breach (SQL injection) 2013-05-10 15:04:16 +02:00
Laurent Destailleur
cc500cceba Fix: form into table is not W3C (broken with some uncommon browsers). 2013-05-09 22:39:31 +02:00
fhenry
e76f997ded Fix adherent class mistake 2013-04-26 16:53:22 +02:00
fhenry
a06581771c Reveiw extrafield for womplaiance with wiki
http://wiki.dolibarr.org/index.php/Extrafields
2013-04-26 10:29:14 +02:00
Laurent Destailleur
36b314a2d6 Try to solve some problems with table (replaced by div). 2013-04-25 20:27:45 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
Laurent Destailleur
1f0adfaff5 Can remove an element from category when on category view. 2013-04-21 23:44:33 +02:00
Laurent Destailleur
e5a945ba5b Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	ChangeLog
	htdocs/admin/propal.php
	htdocs/compta/journal/purchasesjournal.php
	htdocs/compta/journal/sellsjournal.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/modules/mailings/contacts2.modules.php
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/en_US/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/public/demo/index.php
2013-04-14 01:46:33 +02:00
Laurent Destailleur
43fd068d1d Qual: Uniformize way to get graph sizes. 2013-04-12 18:45:19 +02:00
Laurent Destailleur
3b939206da Look: Minor optimization 2013-04-12 14:55:40 +02:00
Laurent Destailleur
b496436fe3 Qual: Reduce number of methods. Mutualize update_note code. 2013-04-10 10:58:38 +02:00
Laurent Destailleur
af6f075b5c Qual: Better error management.
Qual: Uniformize code for canvas
2013-04-09 23:56:52 +02:00
Grand Philippe
d7f2c9c480 some fixes for missing names 2013-04-08 14:21:42 +02:00
Grand Philippe
707ef0f378 some fixes for missing names 2013-04-08 14:12:46 +02:00
Laurent Destailleur
5c3e6de073 Qual: Mutualize code. Only one function to build address format. 2013-04-07 17:39:08 +02:00
Marcos García
6252857440 Fixed translations and BILL_SUPPLIER_BUILDDOC trigger 2013-04-06 17:56:10 +02:00
Laurent Destailleur
25ec7eed6d New: Can send email to warn when payment for subscription is payed. 2013-04-06 16:14:28 +02:00
Laurent Destailleur
d8a86453e5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-04 21:15:16 +02:00
Laurent Destailleur
677fb46136 Optimize size of graph 2013-04-04 21:13:51 +02:00
Laurent Destailleur
607ebbfe8b Qual: Replace tab with div 2013-04-04 19:42:21 +02:00
Laurent Destailleur
76910d4159 Look: Start to use div to render actions buttons 2013-04-03 18:37:54 +02:00
jfefe
cf6f4405cb Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields
Conflicts:
	htdocs/comm/propal.php
2013-04-01 19:44:55 +02:00
jfefe
a8874ebcc8 Uniformize usage of extrafields methods 2013-04-01 19:43:26 +02:00
Laurent Destailleur
f52fe71018 Fix: Bad div closing 2013-03-30 19:40:52 +01:00
Laurent Destailleur
000fe2c864 New: Better error management for add/remove of memeber into mailman. 2013-03-30 18:04:33 +01:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh
Convert DOS files to unix
2013-03-30 14:27:13 +01:00
jfefe
013eac1147 Better error management when add/update extrafield
Usage of setEventMessage() function
2013-03-27 21:24:45 +01:00
Laurent Destailleur
350bcea183 Merge 2013-03-22 17:10:17 +01:00
Laurent Destailleur
fcef334122 Merge pull request #748 from GPCsolutions/naturalsearch
Natural search
2013-03-16 07:38:55 -07:00
Laurent Destailleur
55f9879a6c Replace table with div. Prepare work for android application. 2013-03-16 14:53:15 +01:00
Raphaël Doursenaud
656915b8a8 Added natural search to members 2013-03-15 15:48:03 +01:00
Grand Philippe
e1baf806b9 change birth instead of naiss 2013-03-13 22:17:03 +01:00
Laurent Destailleur
746e005726 Fix: Fix ton of regression due to field name change 2013-03-09 20:34:38 +01:00
Laurent Destailleur
3e5ee3b00a Fix: PHPUnit tests are back. 2013-03-09 18:55:57 +01:00
Laurent Destailleur
b9bb0f9857 Merge pull request #716 from grandoc/develop
fix : deprecated
2013-03-06 10:30:58 -08:00
Laurent Destailleur
baf6ccf654 New: Can define of we want to use VAT or not for subscriptions
(foundation module).
New: Can define a default choice for choice "More action when
recording a subscription" (foundation module).
2013-03-06 17:16:26 +01:00
Grand Philippe
b6581c2b26 fix : deprecated 2013-03-06 16:38:15 +01:00
Grand Philippe
6fb6b916c7 english language standardization 2013-02-27 11:24:50 +01:00
Grand Philippe
79c2e17cbb english language standardization 2013-02-25 17:56:41 +01:00
Grand Philippe
eddf910438 fix issue with english language standardization 2013-02-25 10:00:09 +01:00
Grand Philippe
b081589129 english language standardization 2013-02-25 09:52:24 +01:00
Grand Philippe
6decab1847 english language standardization 2013-02-25 09:17:38 +01:00
Grand Philippe
dfae543d5e english language standardization 2013-02-24 15:57:02 +01:00
Grand Philippe
a237be0d24 english language standardization 2013-02-23 15:26:39 +01:00