lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,797 Commits 43 Branches 150 Tags 886 MiB
3.3.0
Commit Graph

30000 Commits

Author SHA1 Message Date
Laurent Destailleur
c107697dc1 Fix: Var not always initialized 2012-12-12 18:14:21 +01:00
simnandez
8ac17c8206 Trad: Fix typo error into es_ES 2012-12-12 17:12:50 +01:00
simnandez
7cbcd1fc5d Fix: Withdrawal spanish generation adapted to new AEAB rule: profid1 is 
mandatory
 2012-12-12 17:00:29 +01:00
simnandez
488d482508 Fix: Withdrawal spanish generation adapted to new AEAB rule: profid1 is 
mandatory
 2012-12-12 16:57:53 +01:00
Laurent Destailleur
e2e86e16d0 Merge pull request #537 from grandoc/develop 
Develop
 2012-12-12 07:01:54 -08:00
Laurent Destailleur
13d5a2e12c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-12 14:46:33 +01:00
Laurent Destailleur
bdb112c820 Fix: Using bad root url. 2012-12-12 14:46:13 +01:00
Laurent Destailleur
411bdfda5f Merge pull request #538 from simnandez/develop 
Fix: Use transcountry instead trans for localtaxes label
 2012-12-12 05:41:56 -08:00
Laurent Destailleur
2c2465ffad Comment to make test 2012-12-12 13:14:28 +01:00
simnandez
614a8e48a2 Fix: Use transcountry instead trans for localtaxes label 2012-12-12 12:40:30 +01:00
Grand Philippe
993e484bdd prepare multi-user event 2012-12-12 12:17:56 +01:00
Laurent Destailleur
4413c0a5a7 Fix: upload user file 2012-12-12 11:57:56 +01:00
Laurent Destailleur
5d370c7e96 Fix: force redirect to https could not work for some environments 2012-12-12 02:37:15 +01:00
Laurent Destailleur
0128cc36c8 Fix: url example 2012-12-12 01:57:52 +01:00
Laurent Destailleur
caf897cfa7 Clean code to help debug pb with payment methods. 2012-12-12 01:49:23 +01:00
Laurent Destailleur
a972199296 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-12 00:51:15 +01:00
Laurent Destailleur
38b1c540ef Fix: Bad url forging 2012-12-12 00:49:32 +01:00
Grand Philippe
dc0558989b Merge remote-tracking branch 'origin/develop' into develop 2012-12-11 19:04:54 +01:00
Laurent Destailleur
7c19fc97b8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-12-11 18:05:39 +01:00
Christophe Battarel
27670d62ba fix missing $conf global var in llxHeader() function 2012-12-11 15:14:43 +01:00
Laurent Destailleur
cee805f473 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-12-11 11:00:37 +01:00
Laurent Destailleur
080276a504 Fix: bad escape function. email missing 2012-12-11 10:59:03 +01:00
Laurent Destailleur
1c02dc4f9d Fix: better translation 2012-12-11 10:50:35 +01:00
Laurent Destailleur
f4459ee1f1 Fix: Regression detected by PHPUnit 2012-12-10 19:06:59 +01:00
Laurent Destailleur
43fe5766a1 New: Holiday need to support half day to be usefull. 2012-12-10 16:10:08 +01:00
Grand Philippe
a91a96e72e merge 2012-12-10 10:02:13 +01:00
Laurent Destailleur
8e764e88e6 Update TCPF 
Added japanese font files.
 2012-12-10 01:47:39 +01:00
Laurent Destailleur
ab5998d32f Fix: japanese language 2012-12-10 01:42:25 +01:00
Ricardo Sequeira
cf3831d4da Improved translation 2012-12-09 21:17:59 +00:00
Laurent Destailleur
21bd9bf749 Merge pull request #533 from FHenry/develop 
comment
 2012-12-09 11:56:54 -08:00
Laurent Destailleur
5931df82c6 Qual: Clean code to make choice of default value easier. 2012-12-09 20:54:45 +01:00
Laurent Destailleur
70be706347 New: Add greece regions and provinces 2012-12-09 20:01:16 +01:00
fhenry
adcb70eafa Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-12-09 19:13:47 +01:00
Laurent Destailleur
773e3decf6 Fix: typo 2012-12-09 18:50:10 +01:00
Laurent Destailleur
c44481fb91 Normalize key name 2012-12-09 18:47:23 +01:00
Laurent Destailleur
f4def0cd89 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-09 18:45:03 +01:00
Laurent Destailleur
03cacbcd1d Ignore external modules 2012-12-09 18:44:31 +01:00
Laurent Destailleur
f47422f551 Fix: Errors into turnover reports 2012-12-09 18:40:01 +01:00
Laurent Destailleur
77ca4241a5 New: Can input a payment back onto an credit note. 2012-12-09 18:39:42 +01:00
fhenry
ec09f79a2f comment 2012-12-08 19:23:13 +01:00
Regis Houssin
158f581f03 Merge pull request #532 from FHenry/develop 
prepare module for "Single login at one time"
 2012-12-08 10:09:29 -08:00
fhenry
0e76875e9c prepare single login at one time 2012-12-08 18:41:32 +01:00
Laurent Destailleur
8a5485c9b6 New: Skin can be personalized according to environment. 2012-12-08 18:38:14 +01:00
Laurent Destailleur
cd676b323d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-08 18:32:18 +01:00
fhenry
4570c57bfd Change-Id: I003fa45e6e932350b9d21b00ed4817b943470223 2012-12-08 18:28:19 +01:00
fhenry
131dc88139 prepare module for "Single login at one time" 2012-12-08 18:14:13 +01:00
Laurent Destailleur
c3e3595d9c Look: Uniformize style 2012-12-08 17:42:08 +01:00
Laurent Destailleur
3ec2ea0b25 Fix: More complete system info 2012-12-08 17:14:51 +01:00
fhenry
b3d21a4320 Fix [ bug #634 ] Install faild on PostGreSQL 
Fix  [ bug #631 ] Index Creation failed on fresh install with PostgreSQL
 2012-12-08 17:01:07 +01:00
fhenry
dbe00e9fbd Better bahaviour for pgSQL autoupdate trigger 2012-12-08 16:01:05 +01:00
Laurent Destailleur
58118bb366 Fix: error during include when multicompany module enabled. 2012-12-08 15:35:08 +01:00
Laurent Destailleur
ac3eb2e86c Fix: Use different css cache file for each user. This fix problem when 
using personalised constants that change style.
 2012-12-08 15:29:24 +01:00
Laurent Destailleur
afb45e1b31 Comment 2012-12-08 15:26:27 +01:00
Regis Houssin
bfd44da265 Merge pull request #529 from FHenry/develop_extrafielddeletion 
Extrafield remove and PgSQL field tms convertion
 2012-12-08 05:41:41 -08:00
Laurent Destailleur
6a60b78b28 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-08 14:25:36 +01:00
Laurent Destailleur
b119ab5539 Prepare 3.3 freeze. 2012-12-08 14:24:57 +01:00
fhenry
1d6bc23f4d - Uniformize Extrafield deletion for adherent,user,product,societe by 
using commonobject method
 - Add convertion of tms timestamp special case in mysql for pgsql
 2012-12-08 14:23:52 +01:00
Laurent Destailleur
db91526643 Fix: Solve conflict into migration/backup/restore (child tables 
must be after parent tables).
Fix: Migration of old version
 2012-12-08 14:16:39 +01:00
fhenry
574a950dc6 Add third party extrafield in web service exposure 2012-12-08 13:30:39 +01:00
fhenry
99f01f1dca [Task 632] : Add standard extra field feature for Agenda 2012-12-08 12:49:20 +01:00
Regis Houssin
9bc32b1b70 Merge pull request #524 from simnandez/develop 
Trad: Fix ca_ES and es_ES translations
 2012-12-08 01:47:25 -08:00
Regis Houssin
4e79a445c5 Merge pull request #522 from atm-maxime/develop 
Fix : minor html fix + changelog
 2012-12-08 01:46:59 -08:00
simnandez
5778683849 Trad: Fix ca_ES and es_ES translations 2012-12-07 17:13:09 +01:00
Regis Houssin
f984b669b2 Fix: Fix: Use another method to help avoid having a space in value in 
order to use this value with jquery
 2012-12-07 13:48:11 +01:00
Maxime Kohlhaas
4cffe3e5a3 Fix : minor html fix + changelog 2012-12-07 11:06:51 +01:00
Regis Houssin
be7d545297 Fix: wrong variable name 2012-12-07 10:50:16 +01:00
Regis Houssin
8ea3614a3c Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-12-07 10:48:10 +01:00
Regis Houssin
7ff3002993 Fix: Check if amount is numeric, for example, an error occured when 
amount value = o (letter) instead 0 (number)
 2012-12-07 10:47:36 +01:00
Laurent Destailleur
41302b7b75 Merge pull request #521 from grandoc/develop 
fix : typo
 2012-12-06 11:15:10 -08:00
Laurent Destailleur
3858085a7f Add option MAIN_HELPCENTER_LINKTOUSE to define target link "I need help" 
onto logon page.
 2012-12-06 17:59:37 +01:00
Grand Philippe
c6a3add952 fix : typo 2012-12-06 17:09:12 +01:00
Regis Houssin
50206bbd73 Fix: avoid errors 2012-12-06 10:43:27 +01:00
Laurent Destailleur
2cfd8fbd64 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-05 21:32:49 +01:00
Laurent Destailleur
7250592d0c Code comments 2012-12-05 21:32:18 +01:00
Christophe Battarel
bbc470b3ae add search box to find product by supplier ref 2012-12-05 19:56:23 +01:00
Christophe Battarel
88db3da002 allowing product search by supplier ref 2012-12-05 19:51:25 +01:00
Christophe Battarel
b68153ce9a add button in order to create intervention from services ordered 2012-12-05 19:07:07 +01:00
Christophe Battarel
0c064c777a add ability to fichinter to be created from an order (services only) 2012-12-05 19:01:18 +01:00
Christophe Battarel
2a4261db28 add linked object storage in fichinter 2012-12-05 18:48:02 +01:00
Laurent Destailleur
db2eb79f34 Merge pull request #517 from atm-maxime/develop 
Fix : on supplier bill validation, question about stock was asking for s...
 2012-12-05 07:14:05 -08:00
Maxime Kohlhaas
64f5d59ddf Fix : on supplier bill validation, question about stock was asking for stock decrease instead of increase 2012-12-05 15:42:59 +01:00
Regis Houssin
136f454111 Merge pull request #516 from atm-maxime/develop 
Trans : counter to 0 every month translations
 2012-12-05 06:02:18 -08:00
Maxime Kohlhaas
2824278414 Trans : counter to 0 every month translations 2012-12-05 14:56:29 +01:00
Maxime Kohlhaas
5992ebcdbc New : option to reset numbering to 0 every month using @99 in the mask 2013-02-06 11:52:49 +01:00
Laurent Destailleur
4a5062283d Merge pull request #515 from atm-maxime/develop 
New : option to reset numbering to 0 every month using @99 in the mask
 2012-12-05 04:19:16 -08:00
Regis Houssin
a4f0b7f0df Fix: avoid error with external modules 2012-12-05 11:36:10 +01:00
Regis Houssin
3d4621327c Fix: EOL !! tant que ce problème sera présent, les risques de problèmes 
de merge et de conflits sera présent !! il faut utiliser la dernière
version d'Eclipse et de Egit...
 2012-12-05 11:18:45 +01:00
Regis Houssin
644a05f6dc Merge pull request #457 from atm-maxime/mko559 
Task # 559 : price by quantity
 2012-12-05 00:15:27 -08:00
Maxime Kohlhaas
954a578ebd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-12-05 09:10:55 +01:00
jfefe
9a8f81c740 Remove deprecated fields 
fix : data is an array, not an object
 2012-12-05 06:42:05 +01:00
jfefe
8ae10ef9f0 New webservice methods for contact : 
- new method to get contact info
- new method to create a contact
- new method to get a list of contact for a thirdparty
 2012-12-05 03:47:25 +01:00
jfefe
771634c66b Add contact info when get an user by webservice 2012-12-05 02:11:11 +01:00
Laurent Destailleur
bee97a6b3b Restore another lost commit. 
Fix: Restore compatibility with FPDF.

Conflicts:
	htdocs/core/lib/pdf.lib.php
 2012-12-05 00:47:20 +01:00
Laurent Destailleur
5d27fd61df Beautify instal pg. 
Fix: Debian package
Restore PHPUnit test (A PHP Unit test that fails should not be removed
but fixed and be kept in error until fix is published. Otherwise,
PHPUnit are useless).

Conflicts:
	htdocs/install/fileconf.php
	htdocs/install/inc.php
 2012-12-05 00:45:10 +01:00
Laurent Destailleur
e3d07621eb Fuck git. Restore another lost commit. 2012-12-04 20:51:45 +01:00
Laurent Destailleur
b0b0f06655 Fix: Removed useless code 2012-12-03 20:23:16 +01:00
Laurent Destailleur
9b9b8b4156 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-03 20:19:53 +01:00
Laurent Destailleur
bac4bf07a3 New: Add patch from pgrand to start link of several contacts onto an 
event
 2012-12-03 20:19:35 +01:00
Regis Houssin
a0bed6c47f Fix: For avoid conflicts with external modules 2012-12-03 17:29:08 +01:00
Regis Houssin
4388be7295 FIXME $ident is not defined 2012-12-03 17:16:04 +01:00
Regis Houssin
c0fba8262f FIXME pending correction of the "addline" method 2012-12-03 11:20:03 +01:00
Regis Houssin
9079c1fb3b Fix: phpunit error 2012-12-03 09:58:18 +01:00
Laurent Destailleur
7d8c0837b6 Restore another lost commit. 2012-12-02 19:45:35 +01:00
Laurent Destailleur
518b169a89 Increase field size (some system need to store an url here) 2012-12-02 19:41:49 +01:00
Laurent Destailleur
7b824665a5 Revert "Increase field size (some system need to store an url here)" 
This reverts commit 7ade37831e.
 2012-12-02 19:41:06 +01:00
Laurent Destailleur
7ade37831e Increase field size (some system need to store an url here) 2012-12-02 19:33:39 +01:00
Laurent Destailleur
86e08e87d5 Fix: date format 2012-12-02 18:21:26 +01:00
Laurent Destailleur
fd22705de4 New: Log handler can now manage indent on database transactions 2012-12-02 15:20:45 +01:00
Laurent Destailleur
d578d0be2b Perf: Log optimize. Saved 10KB of memory. 2012-12-02 14:33:24 +01:00
Laurent Destailleur
d428549e15 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-02 13:51:52 +01:00
Laurent Destailleur
938dc92ab6 Qual: More complete error management into delete methods 2012-12-02 13:51:33 +01:00
Laurent Destailleur
6fcc32b326 Comments 2012-12-02 12:59:06 +01:00
Regis Houssin
00aa22e1d7 Fix: wrong EOL 2012-12-02 11:03:23 +01:00
Christophe Battarel
c3aa626e18 function getTypeOfLocalTaxFromRate now receives thirdparty in parameter and returns array of localtax type and amount/rate. no more sql in pdf model. 2012-12-02 10:52:53 +01:00
Christophe Battarel
f0e75bf11a dont use ES translation for labels 2012-12-02 10:52:04 +01:00
Christophe Battarel
785491ca2c add function gettypeoflocaltax and modify pdf models 2012-12-02 10:51:18 +01:00
Christophe Battarel
8544003d7b remove unused arrays into pdf models (localtaxes) 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php

Change-Id: I633bfc4b0ec39f9121662d0f876f1edb36173e8e
 2012-12-02 10:49:29 +01:00
Christophe Battarel
093468420a show local taxes on crabe pdf model 2012-12-02 10:42:24 +01:00
Laurent Destailleur
09bb10b2a6 Restore lost commit 2012-12-01 15:50:39 +01:00
simnandez
3ab0b26d00 Trad: Update ca_ES and es_ES profid of countries 2012-12-01 15:47:52 +01:00
simnandez
c365dbc679 New: [ task #314 ] Can define if prof id are mandatory or not 2012-12-01 15:47:39 +01:00
simnandez
4f2f56fced New: [ task #314 ] Can define if prof id are mandatory or not 2012-12-01 15:47:33 +01:00
simnandez
d8651ca830 Trad: Add missing margins translations 2012-12-01 15:47:28 +01:00
simnandez
d14308e07d Trad: Add ca_ES and es_ES missing translations 2012-12-01 15:47:22 +01:00
simnandez
af304638c8 Fix: Add to areas not working if we navigate with shownavref 2012-12-01 15:47:16 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50 
commits !
 2012-12-01 15:45:05 +01:00
Maxime Kohlhaas
69fa1e9d10 Fix : replace PRODUIT_PRICE_BY_QTY by PRODUIT_CUSTOMER_PRICES_BY_QTY 2012-12-01 14:38:59 +01:00
Maxime Kohlhaas
e45438994c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-12-01 14:36:51 +01:00
Laurent Destailleur
bba1492621 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-01 12:23:12 +01:00
Laurent Destailleur
d30b74e69e Merge pull request #508 from simnandez/develop 
Fix: Add to areas not working if we navigate with shownavref
 2012-12-01 02:56:11 -08:00
Laurent Destailleur
daacf797c4 Merge pull request #500 from cbattarel/develop 
[Task #204] more local taxes manangement
 2012-12-01 02:49:45 -08:00
Laurent Destailleur
d2adaf7fdc Merge pull request #506 from FHenry/develop 
Add import_key attribute into contact class creation SQL request
 2012-12-01 02:49:24 -08:00
Laurent Destailleur
31b37c5aff Fix: Length not hard coded 2012-12-01 11:31:02 +01:00
simnandez
a2123d0fe9 Trad: Update ca_ES and es_ES profid of countries 2012-11-30 21:49:27 +01:00
simnandez
b4e16827dc New: [ task #314 ] Can define if prof id are mandatory or not 2012-11-30 21:23:12 +01:00
Laurent Destailleur
624c0fa040 Fix: Restore compatibility with FPDF. 2012-11-30 20:31:43 +01:00
Laurent Destailleur
9d17b8f96c Fix: Label not complete 2012-11-30 19:39:22 +01:00
simnandez
6487baa081 New: [ task #314 ] Can define if prof id are mandatory or not 2012-11-30 18:46:05 +01:00
simnandez
dda12c3d70 Trad: Add missing margins translations 2012-11-30 17:58:12 +01:00
simnandez
f0ba52445d Trad: Add ca_ES and es_ES missing translations 2012-11-30 17:36:48 +01:00
simnandez
dbf1a727be Fix: Add to areas not working if we navigate with shownavref 2012-11-30 16:20:01 +01:00
Laurent Destailleur
008f5fbcfc New: extrafields are available onto users cards. 2012-11-30 15:55:59 +01:00
Christophe Battarel
b70df3762c Merge branch 'develop' of https://github.com/cbattarel/dolibarr into develop 2012-11-30 10:58:57 +01:00
Christophe Battarel
04718b1832 resolve conflict 2012-11-30 10:57:42 +01:00
fhenry
f7b6f44767 oops, correct version 2012-11-30 04:51:11 +01:00
fhenry
1315e9a2ba Add import_key attribute into contact class creation SQL request 2012-11-30 04:40:06 +01:00
Regis Houssin
75fa37cde9 Fix: avoid warning in strict mode 2012-11-30 00:41:31 +01:00
Regis Houssin
c37ebea688 Fix: use $object->id instead $id for security 2012-11-30 00:35:38 +01:00
Regis Houssin
969b510a6a Fix: best method 2012-11-30 00:29:13 +01:00
Regis Houssin
5d1b5d5e0c Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-11-30 00:06:54 +01:00
Regis Houssin
31785c8868 Fix: uniformize code 2012-11-30 00:06:25 +01:00
Laurent Destailleur
2ccf9462e4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-29 23:12:31 +01:00
Laurent Destailleur
b12469c562 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/holiday/fiche.php
 2012-11-29 23:12:16 +01:00
Laurent Destailleur
b507c12b13 Merge pull request #503 from atm-maxime/mko608 
Qual : remove multi fetch
 2012-11-29 14:08:03 -08:00
Laurent Destailleur
49a6c661fd Merge pull request #505 from FHenry/develop 
Fix installation error Erreur SQL : DB_ERROR_SYNTAX - insert into
 2012-11-29 14:07:47 -08:00
Laurent Destailleur
d5de68b985 Merge pull request #504 from simnandez/develop 
Qual: Uniformize withdrawals tabs
 2012-11-29 14:05:13 -08:00
Laurent Destailleur
184cced303 New: Implement all call to allow to remove a tab by an external module 2012-11-29 23:02:02 +01:00
fhenry
a49bf61f33 Add AGENDA_USE_EVENT_TYPE configuration into Agande module configuration 2012-11-29 19:09:36 +01:00
Regis Houssin
3005a4f7cf Fix: use specific code for avoid conflict 2012-11-29 18:37:37 +01:00
Regis Houssin
ffbeb38747 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-11-29 18:31:00 +01:00
Regis Houssin
583dfb225c New: add possibility to force label of buttons and hide the second 
button for dialog info only
 2012-11-29 18:30:16 +01:00
fhenry
c3ced863c1 Fix installation error Erreur SQL : DB_ERROR_SYNTAX - insert into 
llx_c_actioncomm (id, code, type, libelle, module, active, position)
values ( 5, 'AC_RDV', 'system', 'Rendez-vous' ,NULL, ,1 1); - You have
an error in your SQL syntax; check the manual that corresponds to your
MySQL server version for the right syntax to use near '1 1)' at line 1
 2012-11-29 17:59:28 +01:00
Laurent Destailleur
17e0aedebb Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-11-29 13:20:53 +01:00
Laurent Destailleur
a62f2a7c8d New: Add vat rate for south africa. 2012-11-29 12:53:12 +01:00
Christophe Battarel
51d87f8f4a function getTypeOfLocalTaxFromRate now receives thirdparty in parameter and returns array of localtax type and amount/rate. no more sql in pdf model. 2012-11-29 11:36:59 +01:00
Regis Houssin
36ca334821 FIXME: this return create an error in jenkins 2012-11-29 10:43:05 +01:00
Regis Houssin
d97f1937f8 Fix: UPGRADE ECLIPSE AND EGIT WITH THE LAST VERSION PLEASE !!!! 2012-11-29 10:25:33 +01:00
Regis Houssin
88fcfa9533 Fix: uniformize code 2012-11-29 10:23:47 +01:00
Maxime Kohlhaas
e3d6b0dd9e Fix : remove print_r... 2012-11-29 09:52:20 +01:00
simnandez
f348fabf4d Qual: Uniformize withdrawals tabs 2012-11-29 09:34:10 +01:00
Laurent Destailleur
e62b3acef6 Fix: Translation 2012-11-29 01:59:31 +01:00
Laurent Destailleur
0b05d12e84 Fix: Bad picto 2012-11-29 01:27:24 +01:00
Laurent Destailleur
3d10689eca Qual: Maxi debug of withdrawal module. It is possible to understand how 
it works now !
 2012-11-29 01:18:57 +01:00
Maxime Kohlhaas
19f3866b05 Fix : have to fetch object after create to reload values + thirdparty must be loaded if mode = create 2012-11-29 01:05:45 +01:00
Maxime Kohlhaas
1fc35d7d42 Fix : value returned after order confirm was 0 if update OK, and order page wasn't reloaded 2012-11-29 00:38:39 +01:00
Maxime Kohlhaas
0587b06cf4 Fix : global error print + no use of & for affectation 2012-11-29 00:20:24 +01:00
Laurent Destailleur
60fc84a4d9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-29 00:07:21 +01:00
Laurent Destailleur
91e6087d1b Perf: Try to reduce amount of memory used to show events 2012-11-29 00:07:05 +01:00
Laurent Destailleur
9f02b6e5ac Merge pull request #502 from simnandez/develop 
Trad: Add ca_ES and es_ES missing translations
 2012-11-28 10:43:33 -08:00
Laurent Destailleur
8212700c41 Fix: EOL 2012-11-28 19:25:12 +01:00
Laurent Destailleur
b45ef4b578 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-28 19:19:56 +01:00
Laurent Destailleur
effe169850 Fix: pdf_getPDFFontSize must be after pdf_getInstance 2012-11-28 19:19:39 +01:00
simnandez
740810abca Fix: Select of notifications events is showed in french 2012-11-28 18:35:00 +01:00
simnandez
5c86d21941 Fix: Select of notifications events is showed in french 2012-11-28 18:31:52 +01:00
Maxime Kohlhaas
a6b6085772 Qual : remove multi fetch 2012-11-28 18:13:02 +01:00
simnandez
f70bbded5f Trad: Add ca_ES and es_ES missing translations 2012-11-28 18:12:18 +01:00
Christophe Battarel
53cf2ca8f5 dont use ES translation for labels 2012-11-28 17:57:17 +01:00
Christophe Battarel
e459736977 add function gettypeoflocaltax and modify pdf models 2012-11-28 17:47:15 +01:00
Maxime Kohlhaas
a9941480f1 Fix : contact default country 2012-11-28 15:34:42 +01:00
Maxime Kohlhaas
2f743cd7f8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-11-28 15:32:27 +01:00
Laurent Destailleur
b1c13e373a Fix: A better fix to remove fk_pays. 2012-11-28 15:31:55 +01:00
Maxime Kohlhaas
5e5cb1da92 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-11-28 14:53:48 +01:00
Laurent Destailleur
9139427d7f Fix: Country default not selected 2012-11-28 14:51:39 +01:00
Laurent Destailleur
caab5ac4e0 New: Add option to be able to select onto automatic event and manual 
event (or both) into calendar view. Note: For backward compatibility
reason, this will works only for new events.
Qual: Disable old deprecated event code.
 2012-11-28 14:47:30 +01:00
Christophe Battarel
f0918a2536 remove unused arrays into pdf models (localtaxes) 2012-11-28 12:13:03 +01:00
Christophe Battarel
1e8aae4de4 show local taxes on crabe pdf model 2012-11-28 12:11:42 +01:00
Laurent Destailleur
cbdcb50ce2 Merge pull request #499 from cbattarel/develop 
show local taxes on invoice
 2012-11-28 03:11:07 -08:00
Christophe Battarel
12284bf676 show local taxes on invoice 2012-11-28 12:04:31 +01:00
Laurent Destailleur
8fdf4aaf3b Merge pull request #498 from FHenry/develop 
Add cancel button (go bask -1 history)
 2012-11-28 02:37:00 -08:00
Laurent Destailleur
2b51132b32 Translation of localtax admin. 2012-11-28 11:34:52 +01:00
Laurent Destailleur
b34ce6e2f0 Merge pull request #495 from cbattarel/develop 
[ task #204 ] Manage canadian, spain and other country double VAT with a generic system. various updates for local taxes
 2012-11-28 02:08:07 -08:00
Maxime Kohlhaas
925e59e246 Fix : default country on contact creation was not set properly 2012-11-28 11:04:54 +01:00
fhenry
fca43941b0 Add cancel button (go bask -1 history) 2012-11-28 10:57:55 +01:00
Maxime Kohlhaas
32f5b4efa6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-11-28 10:57:51 +01:00
Christophe Battarel
b9cdde88c7 show localtaxes on einstein pdf model 2012-11-28 10:43:21 +01:00
Christophe Battarel
e8e4cc08de show localtaxes in order 2012-11-28 10:35:16 +01:00
Christophe Battarel
0e144dd7c3 fix wrong test for localtax assuj check 2012-11-28 10:32:24 +01:00
Christophe Battarel
f00b4b5527 correction to allow global local tax (type 7) on localtax1 2012-11-28 10:24:40 +01:00
Christophe Battarel
cee8e16e7e correct wrong check for localtaxes 2012-11-28 09:32:41 +01:00
Laurent Destailleur
65110ead88 Merge pull request #496 from FHenry/develop 
Update Common Object update_contact method to allow to change the
 2012-11-27 11:32:53 -08:00
Laurent Destailleur
7ee2ce3c21 Merge pull request #492 from atm-maxime/mko527 
New : go directly into supplier invoice number field after cloning
 2012-11-27 11:08:14 -08:00
Laurent Destailleur
da9ac187dd Merge pull request #493 from atm-maxime/mko545 
Qual : clean unused code
 2012-11-27 11:08:01 -08:00
Laurent Destailleur
53d997f59b Merge pull request #494 from atm-maxime/mko608 
Task # 608 : add clone function on supplier order
 2012-11-27 11:07:03 -08:00
fhenry
5c94912e66 Add datehourpicker in editfieldval method to allow display of hour 2012-11-27 18:35:51 +01:00
simnandez
0bed303596 Trad: Added english (arabi saudia) into ca_ES and es_ES 2012-11-27 17:54:42 +01:00
simnandez
8dc0aec754 [ task #204 ] Manage canadian, spain and other country double VAT with a 
generic system. Add spanish tests
 2012-11-27 16:52:52 +01:00
Christophe Battarel
203a03c4d1 show local taxes on pdf propale azur model 2012-11-27 15:56:45 +01:00
Christophe Battarel
46089bb03c also update ttc with global local taxes 2012-11-27 15:43:52 +01:00
Christophe Battarel
3b8f002e4f display of total local taxes 2012-11-27 15:37:16 +01:00
Christophe Battarel
e87bb02323 retrieve global local taxes in update_price function 2012-11-27 15:34:46 +01:00
Christophe Battarel
9f03b56348 dont put global local tax on lines 2012-11-27 15:33:11 +01:00
fhenry
f456a4d0fe Update Common Object update_contact method to allow to change the 
fk_socppoeple linked
 2012-11-27 15:26:14 +01:00
Laurent Destailleur
a495bcefaa Fix: language translation for araby saudia 2012-11-27 14:13:42 +01:00
Laurent Destailleur
49730ac24f Code comments only 2012-11-27 13:58:06 +01:00
Christophe Battarel
e919ce893a check if company has localtaxes for its country 2012-11-27 13:05:21 +01:00
Laurent Destailleur
6c9d6eda56 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-27 09:34:34 +01:00
Laurent Destailleur
959e061373 Added english (arabi saudia) 2012-11-27 09:34:14 +01:00
Laurent Destailleur
3f64b533f4 Fix: [ bug #607 ] Nom de société avec guillemets 2012-11-26 16:06:50 +01:00
Laurent Destailleur
4abae05c26 Qual: Uniformize behaviour of product selection 2012-11-26 13:37:40 +01:00
Laurent Destailleur
c9edac9cd6 Try to fix differently pb of change/keyup because current change has a 
regression (no way to use ajax select onto supplier orders when using
keybord or mouse selection).
 2012-11-26 13:33:18 +01:00
Laurent Destailleur
d9fb0c941b Qual: remove select to have id same with combo and ajax 2012-11-26 13:28:02 +01:00
Laurent Destailleur
641f4b1ecc Qual: Change to unformize returns of hooks. 2012-11-26 13:26:50 +01:00
Laurent Destailleur
4480af348c Fix: Cols at wrong place 2012-11-26 11:57:20 +01:00
Laurent Destailleur
b4ebd7e852 Qual: Uniformize code and fix a regression 2012-11-26 11:36:45 +01:00
Ricardo Sequeira
4be60985bf Translation improved 2012-11-25 21:48:39 +00:00
Laurent Destailleur
6c8b00b82f Fix: Removed duplictae key 2012-11-25 21:00:51 +01:00
Laurent Destailleur
3de396afa6 Fix: Class not found 2012-11-25 20:42:53 +01:00
Laurent Destailleur
b977ea5d87 Fix: Regression. Show bad error message when we add a product with no 
prices defined.
 2012-11-25 20:38:39 +01:00
Ricardo Sequeira
1f5b23ae39 Improved Translation 2012-11-25 16:04:08 +00:00
Ricardo Sequeira
73d4c92fa3 Improved translation 2012-11-24 20:07:54 +00:00
Ricardo Sequeira
ec96490710 Improved translation 2012-11-24 16:44:25 +00:00
Ricardo Sequeira
4b6393c175 Improved translation 2012-11-24 15:32:38 +00:00
Ricardo Sequeira
e26880a455 Improved translation 2012-11-24 15:10:47 +00:00
Maxime Kohlhaas
437d082308 Fix : multicompany comptability 2012-11-24 00:06:54 +01:00
Ricardo Sequeira
be9e3e4b30 Translation improved 2012-11-23 17:10:11 +00:00
Maxime Kohlhaas
3306d91ce1 Task # 608 : forgot to clone lines... Now lines are also cloned and prices are valid prices at the clone date 2012-11-23 09:00:17 +01:00
Maxime Kohlhaas
0bb3f766f6 New : Add clone function on supplier order + global object fetch instead of each case 2012-11-22 23:38:35 +01:00
Maxime Kohlhaas
5c9058e688 Qual : clean unused code 2012-11-22 21:56:06 +01:00
Maxime Kohlhaas
ba3ae073d7 New : go directly into supplier invoice number field after cloning 2012-11-22 19:59:31 +01:00
Maxime Kohlhaas
0d6aee24f3 Fix : table displayed not like others 2012-11-22 16:35:51 +01:00
Maxime Kohlhaas
9e4cba13c8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-11-22 15:24:10 +01:00
Laurent Destailleur
e76ef823b8 New: Add a tab into members statistics to count members by nature. 2012-11-21 23:01:36 +01:00
Laurent Destailleur
59a305f6f1 New: no dash line if last item. 2012-11-21 20:35:51 +01:00
Laurent Destailleur
35a887f869 Clean code 2012-11-21 20:24:15 +01:00
Laurent Destailleur
1f263943c5 New: Add option to add slashes lines between lines into PDF. 2012-11-21 19:07:03 +01:00
Laurent Destailleur
e6d7ce1ab6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-21 19:04:51 +01:00
Laurent Destailleur
c49fea217f Fix: Another fix on sql request generation. 2012-11-21 19:00:06 +01:00
Regis Houssin
ce4feffd1f Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-11-21 18:56:07 +01:00
Regis Houssin
31ecc1987e Fix: remove old code 2012-11-21 18:52:25 +01:00
Laurent Destailleur
06a8ba2be2 Fix: for combo list that use text key. 2012-11-21 18:51:49 +01:00
Laurent Destailleur
6a11016a21 Fix: var_dump must be commented 2012-11-21 18:45:52 +01:00
Laurent Destailleur
66cf1419ca Fix: llx_c_paper_format dictionnary was not up to date. 2012-11-21 17:48:27 +01:00
Laurent Destailleur
c0c13b862a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-21 14:45:33 +01:00
Laurent Destailleur
af637c8afb Qual: Removed "dolibarr" into default email sender. 2012-11-21 14:45:02 +01:00
Laurent Destailleur
6db5185d7e Fix: Missing include 2012-11-20 23:57:35 +01:00
Laurent Destailleur
733214733e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-11-20 17:46:44 +01:00
Laurent Destailleur
6c4e1caa04 Merge pull request #491 from simnandez/develop 
Trad: Add ca_ES and es_ES translations
 2012-11-20 08:34:45 -08:00
Laurent Destailleur
28e95231c0 Merge pull request #483 from atm-maxime/develop 
Warning on proposal home pages
 2012-11-20 08:34:15 -08:00
Laurent Destailleur
8f0b548714 Debug export filters. Seems to be enougth stable so it is now enabled by 
default.
 2012-11-20 15:56:44 +01:00
Laurent Destailleur
d9cdb542d5 Debug filter during export 2012-11-20 14:07:52 +01:00
Laurent Destailleur
2e0554bfbd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-11-20 13:36:03 +01:00
Laurent Destailleur
ddb3cf6f42 Fix: Debug holiday module 2012-11-20 13:14:16 +01:00
Regis Houssin
babda1d7df Fix: increase field size for GB sort code (xx-xx-xx) 2012-11-20 12:43:00 +01:00
Laurent Destailleur
005716af99 Fix: Missing includes 2012-11-20 12:40:57 +01:00
Laurent Destailleur
a62583e987 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-11-20 12:33:24 +01:00
Laurent Destailleur
2d000b5df8 Fix: The default select choice was not selected when using jquery dialog 
confirm boxes.
 2012-11-20 12:23:32 +01:00
Regis Houssin
2d5368e135 Fix: converting line delimiters 2012-11-20 12:11:19 +01:00
Regis Houssin
a3d9b5788c Fix: use keyup instead change to avoid loosing the product id 
Fix: strict mode
 2012-11-20 12:09:52 +01:00
Laurent Destailleur
6a97a45111 Qual: Rename translation key 2012-11-20 11:27:50 +01:00
Laurent Destailleur
e53f6a383d Fix: Removed a hard coded error code. 2012-11-20 11:23:34 +01:00
Laurent Destailleur
8d50def412 Sec: Do not init password by default when install pages are recalled 2012-11-20 11:22:57 +01:00
simnandez
b593fa2df6 Trad: Add ca_ES and es_ES translations 2012-11-20 09:04:24 +01:00
Laurent Destailleur
6cdb720e9c Fix: Missing info_admin 2012-11-20 00:13:31 +01:00
Laurent Destailleur
72608e7a72 Fix: Checkstyle 2012-11-19 23:43:14 +01:00
Laurent Destailleur
d8d1db143f Typo 2012-11-19 23:26:07 +01:00
Laurent Destailleur
bd90d7979d Qual: Removed duplicate code 
Qual: Removed deprecated warning
 2012-11-19 17:42:37 +01:00
Laurent Destailleur
0fb126a7e3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-11-19 17:30:57 +01:00
Laurent Destailleur
3b861598a7 Doc 2012-11-19 17:29:57 +01:00
simnandez
3fe79b379d Fix: Bad calculation of localtax amount calculation if type of 
localtaxes are 1 3 or 5. Researched by Eldy
 2012-11-19 17:10:28 +01:00
Maxime Kohlhaas
ec37a5e005 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-11-19 13:31:23 +01:00
Maxime Kohlhaas
eec5ddc08d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-11-19 13:31:15 +01:00
Regis Houssin
1a4c582b05 Merge pull request #489 from jfefe/webservices 
New webservice for order with method to get, create and valid an order
 2012-11-19 03:16:51 -08:00
jfefe
7157869371 New webservice for order with method to get, create and valid an order 2012-11-19 12:14:51 +01:00
Regis Houssin
f933e03285 Merge pull request #488 from jfefe/webservices 
Add information about price when call a product by webservice
 2012-11-19 01:33:50 -08:00
jfefe
d9d01c80b0 Add information about price when call a product by webservice 2012-11-19 00:35:01 +01:00
Laurent Destailleur
95afbdbd5e Merge pull request #485 from grandoc/develop 
fix some text
 2012-11-18 09:55:39 -08:00
Laurent Destailleur
b9868bf0ce Fix: units 2012-11-18 18:44:51 +01:00
Laurent Destailleur
c2d4b4d2e9 Fix: Edit of emailing setup was not possible 2012-11-18 18:36:50 +01:00
Grand Philippe
1b74df932b fix some translations 2012-11-18 17:39:49 +01:00
Grand Philippe
86ed4ba08c fix some translations 2012-11-18 17:29:31 +01:00
Laurent Destailleur
f58d0636a1 Doxygen 2012-11-18 16:55:00 +01:00
Laurent Destailleur
eb7dc8934c Fix: Do not loose label 2012-11-18 16:41:10 +01:00
Laurent Destailleur
46976bd009 Fix: Some fix in volume calculation 2012-11-18 16:21:38 +01:00
Laurent Destailleur
7386dc3aef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-18 15:24:15 +01:00
Laurent Destailleur
6512fd90a9 New: Can export customer shipments. 2012-11-18 15:24:01 +01:00
Laurent Destailleur
e490aeef43 Merge pull request #487 from jfefe/webservices 
Webservices
 2012-11-18 06:15:21 -08:00
jfefe
324b11ebb9 Add comment 2012-11-18 13:20:27 +01:00
jfefe
f47ce7b220 New webservice to fetch categories 2012-11-18 13:15:19 +01:00
Laurent Destailleur
e0de91144a Merge pull request #484 from simnandez/develop 
Fix: Local taxes. If buyer not subject to localtax no need make database
 2012-11-18 03:11:37 -08:00
Laurent Destailleur
f1f080b86a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-18 11:52:19 +01:00
Laurent Destailleur
3fa7afae10 Fix: jquery upgrade has broken background compatibility with plugins. 
Upgrade jquery core only if required.
 2012-11-18 11:52:04 +01:00
Regis Houssin
dc775c4418 Merge pull request #486 from jfefe/webservices 
Webservices
 2012-11-17 23:35:33 -08:00
jfefe
0f789f6ad3 New webservice method to get list of product for a specific category 2012-11-17 23:40:58 +01:00
jfefe
40a3704739 New webservice method to get list of usergroups 2012-11-17 23:21:12 +01:00
Laurent Destailleur
fe86b5d29e Fix: 2 other fixes on option MAIN_JS_ON_PAYMENT 2012-11-17 20:25:44 +01:00
Laurent Destailleur
5b02ff3a86 Fix: 3 fixes on option MAIN_JS_ON_PAYMENT (css, bad path, removed 
forced var)
 2012-11-17 19:55:19 +01:00
Grand Philippe
e5ae46bd11 fix some text 2012-11-17 15:53:04 +01:00
Laurent Destailleur
8c27a3202b Qual: Removed useless files. Speed gain was not significant, has problem 
with https and need a lot of work to maintain each time we update an
external lib.
 2012-11-17 11:56:30 +01:00
Laurent Destailleur
19b7cc66d5 Qual: Remove hidden option so is not efficient and not used files. 
Qual: Uniformize code
 2012-11-17 11:48:51 +01:00
Maxime Kohlhaas
fc4c5f333f Fix : fatal error while importing, function name wasn't complete 2012-11-17 10:19:26 +01:00
Maxime Kohlhaas
da4383777d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-11-17 10:12:33 +01:00
Laurent Destailleur
255bd565fb Removed warning 2012-11-17 00:58:43 +01:00
Laurent Destailleur
61ed6e10e1 Uniformize code 2012-11-16 18:59:03 +01:00
simnandez
5515f15187 Fix: Localtaxes rules for spain 2012-11-16 16:23:51 +01:00
Laurent Destailleur
2e8e1f759f New: Add warning when we try to load sql from an not existing dir 2012-11-16 13:25:49 +01:00
simnandez
b7f38def61 Fix: Local taxes. If buyer not subject to localtax no need make database 
access
 2012-11-16 12:13:29 +01:00
Laurent Destailleur
5f9cf28e45 New: Add option to choose if init of form is for a company third party 
or an individual third party.
 2012-11-15 16:26:05 +01:00
Laurent Destailleur
7c78e1c0f6 Doxygen and normalize code. 
New: add more PHPUnit
 2012-11-15 14:52:19 +01:00
Maxime Kohlhaas
9911c64f0b Fix : $now not defined and proposal date used instead of end validity to display warning 2012-11-14 22:32:20 +01:00
Maxime Kohlhaas
d687d37573 Fix : $now defined twice 2012-11-14 22:31:54 +01:00
Laurent Destailleur
28b4a03432 Fix: Correct vat 2012-11-14 20:49:19 +01:00
Laurent Destailleur
511a75b5de Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-14 18:59:07 +01:00
Laurent Destailleur
ce10c87e09 Fix: No message to show result 
Fix: Must not overwrite property of object
 2012-11-14 18:58:55 +01:00
Laurent Destailleur
4c4eeaac2a Fix: Test fails if value is 0 2012-11-14 18:56:47 +01:00
Laurent Destailleur
768e719961 Fix: firstname was missing 2012-11-14 18:32:52 +01:00
simnandez
096699cf18 Trad: Add missing ca_ES and es_ES translations 2012-11-14 15:17:26 +01:00
jfefe
23e47b7156 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into webservices 2012-11-14 12:42:16 +01:00
jfefe
8f15dd4df2 Fix : correct invoice line description when calling by webservice 2012-11-14 12:42:04 +01:00
Regis Houssin
8908f977b8 Fix: converting line delimiters !!! 2012-11-14 11:31:08 +01:00
Regis Houssin
474b68b3e4 Fix: strict mode mother 2012-11-14 11:29:22 +01:00
Maxime Kohlhaas
667c8cffae Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-11-14 11:02:35 +01:00
Laurent Destailleur
5e583b65f2 Doxygen 2012-11-14 01:35:39 +01:00
Laurent Destailleur
df42dda452 Doxygen 2012-11-14 01:20:36 +01:00
Laurent Destailleur
3dd9d20d53 Add alternative picto for rendez-vous. 2012-11-14 00:59:52 +01:00
Laurent Destailleur
06c77576b7 New: Maxi debug on feature to filter lines on export. Removed a lot of 
bugs but I had to change a lot of thing to fix this. There is still
work to now save filters in session.
 2012-11-14 00:27:25 +01:00
Laurent Destailleur
81f9b54618 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-14 00:23:47 +01:00
Laurent Destailleur
1fa9048ca5 Update nl_BE 2012-11-14 00:23:31 +01:00
Regis Houssin
7be2057b00 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-11-13 22:44:33 +01:00
Regis Houssin
8e141fce14 Fix: strict mode father 2012-11-13 22:43:54 +01:00
Laurent Destailleur
3c7ad3d58c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-11-13 17:27:16 +01:00