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

3578 Commits

Author SHA1 Message Date
frederic34
2b19f75460 Files Integrity Checker 2015-02-19 21:26:03 +01:00
Laurent Destailleur
e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
 2015-02-19 00:01:26 +01:00
Laurent Destailleur
4963555669 Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-misc

Conflicts:
	htdocs/barcode/codeinit.php
 2015-02-18 22:54:02 +01:00
Laurent Destailleur
b6947dbe2c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
 2015-02-18 22:04:26 +01:00
Laurent Destailleur
cc1d506614 Miscelaneous debug on barcode features. 2015-02-18 21:01:17 +01:00
Gauthier
02d59cce5a NEW : Product stock and subproduct stock are independant 2015-02-16 16:06:50 +01:00
Laurent Destailleur
e3885d6d73 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/lib/tax.lib.php
 2015-02-10 21:36:38 +01:00
Marcos García de La Fuente
e21681a369 PHPDoc and misc fixes for Admin 2015-02-10 10:52:48 +01:00
phf
34bc1dbc15 Merge branch 'develop' into new_ask_price 2015-02-09 09:07:50 +01:00
Laurent Destailleur
64963ef9bd Fix: the syslog handler for chromphp an fiefoxphp was not visible when 
they should not.
 2015-02-07 19:12:22 +01:00
Laurent Destailleur
011d39105d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/admin/export.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/datepicker.php
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/fourn/facture/card.php
 2015-02-07 03:28:36 +01:00
Laurent Destailleur
53453a63f5 Fix: pb when posting page due to apache limit 2015-02-07 01:45:09 +01:00
phf
bf643c26da [CORE] FIX : des noms des hooks 
+ correction nom de variable (#new_ask_price).
 2015-02-06 09:50:27 +01:00
phf
bcbf29d9a5 [CORE] assainissement du code + traductions FR vers EN (#new_ask_price). 2015-02-04 15:39:57 +01:00
Laurent Destailleur
96215ccea5 Fix bad operator for and 2015-02-03 13:05:28 +01:00
frederic34
b850b7b448 Merge remote branch 'upstream/develop' into tooltip 
Conflicts:
	htdocs/langs/en_US/sendings.lang
 2015-01-30 16:45:24 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
 2015-01-30 15:53:06 +01:00
Laurent Destailleur
67c1ae8593 Fixed: condition to show menus 2015-01-30 15:47:27 +01:00
phf
87398c7d43 [CORE] renomage de variables pour être en rapport avec le module (#new_ask_price). 2015-01-29 10:42:53 +01:00
Drosis Nikos
fc7f2f2303 translate UpdateServerOffline 2015-01-28 23:12:46 +02:00
phf
a98ce01807 [CORE] renomage de masse + correction des noms des fichiers/fonctions par copie + ajout de clés de traductions (#new_ask_price). 2015-01-28 17:27:26 +01:00
Drosis Nikos
872fe15743 Check live last version from sourceforge.net 2015-01-26 17:05:47 +02:00
frederic34
e18577aa62 Tooltip and lib for file cache 2015-01-24 21:46:05 +01:00
cla
134759ce28 update table name facture_fourn_det_extrafields 2015-01-22 15:02:19 +01:00
cla
c953a04687 Added files for Extrafields in Order/Invoice Supplier Line. New files 
sql added in install/mysql folder and 2 new pages to insert extrafields
in admin folder
 2015-01-22 14:18:33 +01:00
Marcos García de La Fuente
fb186d6ef8 Added delay between mails in Newsletter module 2015-01-18 16:26:26 +01:00
Ion Agorria
48c6897f75 Store per entity SMTP configuration 2015-01-18 03:20:35 +01:00
Laurent Destailleur
30abacd0a6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-17 14:42:42 +01:00
Laurent Destailleur
87a59ef527 Merge branch 'develop_bank_extrafields' of 
https://github.com/FHenry/dolibarr into FHenry-develop_bank_extrafields

Conflicts:
	htdocs/admin/bank.php
 2015-01-17 14:42:04 +01:00
Laurent Destailleur
6a081fe883 Merge pull request #2229 from frederic34/getnextvalue 
Translation error messages numbering modules
 2015-01-16 12:08:53 +01:00
Laurent Destailleur
c54355b63a Merge remote-tracking branch 'origin/3.7' into develop 2015-01-16 10:44:41 +01:00
Laurent Destailleur
362167f319 Fixed: Export was not using user assigned 2015-01-15 02:32:15 +01:00
Laurent Destailleur
13132ef2ed Better organisation of entries into security setup area 2015-01-12 13:20:27 +01:00
frederic34
173d3aaa90 Translation error messages numbering modules 2015-01-11 11:31:53 +01:00
Laurent Destailleur
fc78d632d3 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
 2015-01-09 23:09:10 +01:00
frederic34
73fda2cb86 WIP PSR2 2015-01-08 18:36:03 +01:00
Laurent Destailleur
443c9d245e Merge pull request #2212 from marcosgdf/misc-doc 
Miscellaneous corrections
 2015-01-06 00:21:05 +01:00
Laurent Destailleur
df3987fa10 Fixed: Bad url link with jquery mobile. We must add rel="external" on 
all external links.
 2015-01-04 14:51:16 +01:00
Marcos García de La Fuente
86100758ff Miscellaneous corrections 2014-12-28 20:13:15 +01:00
Laurent Destailleur
5ead994955 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-26 04:57:55 +01:00
Laurent Destailleur
2a3bb96c34 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ecm.lib.php
 2014-12-22 03:14:22 +01:00
Frédéric FRANCE
3d9ce4c1dc Admin config for ask for payment bank during order 2014-12-21 10:32:11 +01:00
Laurent Destailleur
c05c2fe427 Info to help debug perf pb. 2014-12-20 18:46:29 +01:00
Philippe GRAND
8878ef601f form should open before table 2014-12-16 15:34:56 +01:00
Philippe GRAND
cf196c77fb one close form too much 2014-12-16 15:15:03 +01:00
Philippe GRAND
69c1de3fe1 one close form too much, an other at the wrong place 2014-12-16 15:07:23 +01:00
Philippe GRAND
e40ef3f9ce form closed at the wrong place 2014-12-16 14:49:07 +01:00
Philippe GRAND
dd6d6bc054 open form was at the wrong place 
missing close form
 2014-12-16 14:43:28 +01:00
Laurent Destailleur
8a6f7df186 Merge remote-tracking branch 'origin/3.7' into develop 2014-12-14 12:37:20 +01:00
Laurent Destailleur
711b033844 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/stock/card.php
 2014-12-14 12:35:13 +01:00
Laurent Destailleur
da3bc3868d Fixed: Duplicated lang key 2014-12-14 11:46:21 +01:00
Laurent Destailleur
627e344c78 Documentation of external link. 2014-12-11 14:43:14 +01:00
Laurent Destailleur
03cfff66ea Fixed: no form into table 2014-12-11 14:26:34 +01:00
Laurent Destailleur
63f2bfed24 Fixed: Maxi debug of withdrawal module. 2014-12-09 11:19:16 +01:00
Laurent Destailleur
d7dd496239 Merge branch 'develop-html5' of https://github.com/aspangaro/dolibarr into aspangaro-develop-html5 2014-12-08 00:09:01 +01:00
Laurent Destailleur
344aa40858 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	.travis.yml
	dev/codesniffer/ruleset.xml
	htdocs/core/class/conf.class.php
	htdocs/langs/en_US/productbatch.lang
 2014-12-05 20:21:40 +01:00
Laurent Destailleur
a9338a0f9f Fix: Maxi debug of module productbatch. 
Conflicts:
	htdocs/core/class/conf.class.php
	htdocs/langs/en_US/productbatch.lang
 2014-12-05 16:04:37 +01:00
Laurent Destailleur
5457d3116a Fix: Maxi debug of module productbatch. 2014-12-05 16:01:01 +01:00
Laurent Destailleur
8d405a147f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	htdocs/core/tpl/objectline_create.tpl.php
 2014-12-04 15:29:45 +01:00
Laurent Destailleur
6729544782 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/projet/tasks/task.php
 2014-12-04 14:52:34 +01:00
Laurent Destailleur
83122ebe1e Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now 
for release.
 2014-12-04 13:20:56 +01:00
Laurent Destailleur
b5d74372de Bad var 2014-12-04 01:36:53 +01:00
Laurent Destailleur
f884f16564 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/boxes.php
	htdocs/comm/action/card.php
	htdocs/core/class/html.formfile.class.php
 2014-12-03 12:54:42 +01:00
Frédéric FRANCE
79314b7ff8 Fix missing space 2014-12-03 12:47:11 +01:00
Laurent Destailleur
1a67ae10a4 Merge pull request #2119 from frederic34/patch-7 
Fix missing space
 2014-12-03 12:46:44 +01:00
Laurent Destailleur
2ddc3cb3f0 Fix: Using a select with checkbox will not be compatible when we will 
add feature to put box on other pages.
 2014-12-03 12:43:14 +01:00
Frédéric FRANCE
58621e7e13 Update boxes.php 2014-12-03 12:32:37 +01:00
Laurent Destailleur
6a09bca21e Merge pull request #2120 from frederic34/patch-8 
Update admin config for boxes
 2014-12-03 12:24:03 +01:00
aspangaro
f6ab7ca0c9 Typo 2014-12-02 20:42:47 +01:00
BENKE Charles
3c12d5f420 Update supplierinvoice_extrafields.php 
add orders translation files for correct menu translation error
 2014-12-02 10:36:48 +01:00
Frédéric FRANCE
aade7309e0 Update boxes.php 2014-11-30 15:56:57 +01:00
Laurent Destailleur
01209ff844 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/product/stock/card.php
 2014-11-30 14:15:38 +01:00
Frédéric FRANCE
18f2cfbeac Fix missing space 2014-11-30 13:28:09 +01:00
Laurent Destailleur
7303983610 Fixed: Ton of old bugs when debugging POS. 2014-11-30 01:35:58 +01:00
aspangaro
3db2e46fc6 Typo 2014-11-29 07:41:51 +01:00
aspangaro
64260cde72 Add button in admin->GUISetup to activate Html5 2014-11-29 07:07:27 +01:00
Laurent Destailleur
d3b32ce22f Fixed: Bad function/picto for information messages (not a star) 2014-11-28 19:49:42 +01:00
Laurent Destailleur
a724c3aa70 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/main.inc.php
 2014-11-28 02:26:40 +01:00
Laurent Destailleur
dc1c98734e Fixed: Option specific to a module should start with module name 2014-11-28 00:21:52 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Frédéric FRANCE
f5bc6dc634 Update propal.php 2014-11-24 21:01:55 +01:00
Frédéric FRANCE
655dc35628 Update propal.php 2014-11-24 20:57:26 +01:00
Marcos García de La Fuente
eb569fe235 Fixed [ bug #1712 ] Unable to add a social charge 2014-11-23 16:43:52 +01:00
Marcos García de La Fuente
7d71974362 Fixed [ bug #1712 ] Unable to add a social charge 2014-11-23 16:14:12 +01:00
Laurent Destailleur
2a56a19b7d Merge remote-tracking branch 'origin/3.7' into develop 2014-11-22 16:59:12 +01:00
Laurent Destailleur
671243e8f6 Fixed: Bugs reported by scrutinizer 
Fixed: Solve conflict between ->iban and ->iban_prefix.
 2014-11-22 16:57:08 +01:00
Laurent Destailleur
06b663b92c Merge remote-tracking branch 'origin/3.7' into develop 2014-11-22 00:45:45 +01:00
Laurent Destailleur
a2d4046f50 Fixed: Untranslatable tokens 2014-11-22 00:45:04 +01:00
Laurent Destailleur
0f5203b384 Edit vat 2014-11-20 15:08:13 +01:00
Laurent Destailleur
dae9315374 Fix: duplicate line 2014-11-20 11:06:46 +01:00
Laurent Destailleur
e5e1c542ce Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/security_other.php
	htdocs/langs/en_US/admin.lang
 2014-11-20 10:59:14 +01:00
Laurent Destailleur
358ddb0abc Fix: W3C. form into table is forbidden. This makes some browsers crazy. 2014-11-20 10:15:24 +01:00
Laurent Destailleur
84729a6aa3 Fix: Bad vars 2014-11-18 23:18:59 +01:00
Laurent Destailleur
1d21141de2 Fix: Bad vars 2014-11-18 22:59:48 +01:00
aspangaro
c256243bf7 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-16 08:41:39 +01:00
Laurent Destailleur
ad661256c0 Fix: Bugs reported by scrutinizer 2014-11-15 16:20:03 +01:00
Laurent Destailleur
4df754f36f Merge pull request #2015 from aspangaro/develop-patch 
Update accounting language
 2014-11-15 12:19:23 +01:00
Laurent Destailleur
81f0d953e3 Fix: Bad test 2014-11-12 10:05:40 +01:00
aspangaro
da258cd4b0 Typo & presentation 2014-11-12 07:29:57 +01:00
Florian HENRY
9c795d2c4b Finnish bank extrafeilds 2014-11-10 13:18:27 +01:00
aspangaro
cbfa90abca Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-04 20:57:05 +01:00
Laurent Destailleur
c41e908dba Merge pull request #2000 from Devensys/Develop-MajPasswordPattern 
New modGeneratePass with personal conf
 2014-11-04 17:37:25 +01:00
Andrelec1
796f2409a1 Add verif and correction lang 2014-11-04 11:38:16 +01:00
aspangaro
25433120e6 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-04 06:16:03 +01:00
Andrelec1
5074feacd6 Add option and create new class 2014-11-03 17:57:55 +01:00
Laurent Destailleur
9c51effe5c Ajout plus d'info dans description audit. 2014-10-31 15:42:35 +01:00
Laurent Destailleur
8d964e03d2 Merge branch 'agenda-export-by-project' of github.com:AMMD/dolibarr into 
AMMD-agenda-export-by-project

Conflicts:
	htdocs/admin/agenda_xcal.php
 2014-10-30 18:19:13 +01:00
Laurent Destailleur
6a1a0303d8 Merge pull request #1975 from frederic34/patch-1 
"Is Order shippable" icon
 2014-10-30 18:03:44 +01:00
Laurent Destailleur
38a939771c New: Add template of emails into dictionnary. 2014-10-30 17:16:51 +01:00
Laurent Destailleur
0abeea059e Uniformize and clean boxes behaviour and translation. 2014-10-27 21:48:28 +01:00
Frédéric FRANCE
68fa6cec70 Update commande.php 2014-10-25 11:34:21 +02:00
Laurent Destailleur
0fc1c85b34 New: Module notification has been enhanced: 
EMail use now language of target contact.
Can also define a fixed email for notifications.
Better error management
 2014-10-25 00:42:52 +02:00
Laurent Destailleur
42a600412d Fix: Regression with favorite. 2014-10-20 12:41:18 +02:00
Laurent Destailleur
718b3b19b4 Fix: user and date modification not updated 2014-10-20 11:16:51 +02:00
Grégory DAVID
a794180586 Document the ability to export agenda calendar restricted to project ID 2014-10-18 16:41:47 +02:00
Laurent Destailleur
e53c328767 Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into 
aspangaro-develop-favorite

Conflicts:
	ChangeLog
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-10-18 15:45:44 +02:00
aspangaro
9f6a460d42 Merge remote-tracking branch 'Upstream/develop' into develop-favorite 
Resolve conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-10-18 15:32:50 +02:00
Laurent Destailleur
90d47cffae Better error management and better error message for reporting upload or 
error of images.
 2014-10-18 14:56:06 +02:00
Laurent Destailleur
58b15fa736 Fix: Solve some regressions 2014-10-18 01:32:38 +02:00
aspangaro
861583bb77 Merge remote-tracking branch 'Upstream/develop' into develop-favorite 2014-10-14 06:12:46 +02:00
Laurent Destailleur
f498921715 Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into 
GPCsolutions-droposcommerce

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/vi_VN/admin.lang
	htdocs/langs/vi_VN/shop.lang
 2014-10-13 00:50:51 +02:00
aspangaro
71dafac03c Add favorite button into country dictionary to put value on top select list 2014-10-12 15:28:01 +02:00
Laurent Destailleur
9768550696 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/categories/fiche.php
	htdocs/comm/action/index.php
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/fiche.php
	htdocs/product/composition/fiche.php
	htdocs/product/price.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php
 2014-10-12 02:54:34 +02:00
Laurent Destailleur
a2fed6f214 Fix: miss dol_fiche_end 2014-10-05 23:26:42 +02:00
aspangaro
7e11fa06bb Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-10-05 16:35:38 +02:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name" 
everywhere.
 2014-10-04 17:20:17 +02:00
aspangaro
f70e8b766f Merge remote-tracking branch 'Upstream/develop' into develop-loan 
Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-09-29 20:40:53 +02:00
Laurent Destailleur
8121aeb0b6 Merge pull request #1914 from aternatik/fix_ldapgrp 
Fix: gidNumber ldap attribute was not defined
 2014-09-29 16:39:36 +02:00
Raphaël Doursenaud
f01e76f686 Removed unmaintaned OScommerce module 2014-09-29 15:22:48 +02:00
Laurent Destailleur
e0aa140960 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-29 14:01:40 +02:00
Laurent Destailleur
8ccb581185 Fix: Change for php 5.6 
New: Management of color into type of events dictionnary (visible into
peruser view).
New: Can disable predefined type of events.
 2014-09-29 13:21:03 +02:00
Regis Houssin
f1f4fc18e9 Fix: use "doc" instead "pdf" dir and uniformize code 2014-09-29 11:08:50 +02:00
Regis Houssin
f233d4f610 New: add doc models management in contract module 2014-09-28 20:39:02 +02:00
aspangaro
250b57ca0a Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-09-28 14:00:26 +02:00
Regis Houssin
0997a7960d Fix: uniformize code 2014-09-28 12:53:06 +02:00
Laurent Destailleur
14ab409ca9 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/stock.php
	htdocs/admin/system/index.php
	htdocs/comm/fiche.php
	htdocs/core/lib/admin.lib.php
	htdocs/core/lib/holiday.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/login/functions_forceuser.php
	htdocs/core/login/functions_http.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/filefunc.inc.php
	htdocs/holiday/define_holiday.php
	htdocs/opensurvey/fonctions.php
	htdocs/societe/canvas/actions_card_common.class.php
	test/phpunit/CompanyBankAccountTest.php
	test/phpunit/ExportTest.php
	test/phpunit/FactureTest.php
	test/phpunit/FunctionsLibTest.php
	test/phpunit/PropalTest.php
	test/phpunit/SocieteTest.php
	test/phpunit/WebservicesInvoicesTest.php
	test/phpunit/WebservicesThirdpartyTest.php
 2014-09-28 02:14:32 +02:00
Laurent Destailleur
5fdd798e91 Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on 
parameter).
 2014-09-27 17:13:15 +02:00
Regis Houssin
179da9a220 Fix: uniformize code 2014-09-25 13:50:01 +02:00
Regis Houssin
64b757ed81 Fix: add generic doc and use doc dir instead pdf 2014-09-25 12:44:57 +02:00
Regis Houssin
3daf06960d Fix: add generic doc and uniformize code 2014-09-25 12:07:11 +02:00
aspangaro
a58025c601 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-09-23 21:24:29 +02:00
Laurent Destailleur
dd86453020 Add field color into table of type of events 2014-09-23 17:54:03 +02:00
Eden
248ef4fd46 Fix: gidNumber ldap attribute was not defined i using posixGroup objectClass 2014-09-23 00:13:51 +02:00
aspangaro
1bcc2c92a3 compta_mode -> accounting_mode 2014-09-21 20:42:46 +02:00
aspangaro
e147259e95 Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6 2014-09-21 20:30:55 +02:00
aspangaro
08b9e05425 New Module : Manage Financial Loan 2014-09-21 17:42:38 +02:00
Laurent Destailleur
ee4d697172 Fix several bugs reported by scrutinizer 2014-09-19 14:57:31 +02:00
Laurent Destailleur
ca3c5d9513 Fix: invalid list of params 
Fix: loading of sql menu
 2014-09-19 14:36:55 +02:00
Laurent Destailleur
12ae552486 Fix: Option to make pg_dump/restore 2014-09-17 17:38:07 +02:00
Laurent Destailleur
83447243ae Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	build/debian/get-orig-source.sh
	htdocs/product/class/product.class.php
	htdocs/societe/soc.php
 2014-09-15 22:58:39 +02:00