lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,852 Commits 43 Branches 150 Tags 886 MiB
2a67bd1f38
Commit Graph

1178 Commits

Author SHA1 Message Date
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
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