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

1824 Commits

Author SHA1 Message Date
Juanjo Menent
f8b5bac05c Fix: Import ProfId1 to siren and ProfId2 to siret 2014-07-14 19:40:18 +02:00
Juanjo Menent
3930c8829e Fix: Import ProfId1 to siren and ProfId2 to siret 2014-07-14 19:38:00 +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
Laurent Destailleur
90a5f6c7ef Qual: Remove end php tag. 2014-07-08 01:02:30 +02:00
Laurent Destailleur
e5d5a25433 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
 2014-07-05 11:54:02 +02:00
Laurent Destailleur
faa5eba203 Fix: Substitution for external module at wrong place. 2014-07-04 18:43:37 +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
Juanjo Menent
3679a4ba90 [ task #1063 ] Allow edit localtaxes rate for thirds. Works documents 
pdf
 2014-07-04 13:11:51 +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
Maxime Kohlhaas
7d16f62a9d New : add remaining to ship on delivery PDF 2014-06-28 22:48:20 +02:00
Laurent Destailleur
4cd3a4f4aa Fix: bad indice 2014-06-27 01:34:27 +02:00
Laurent Destailleur
f25bb79d80 Merge pull request #1672 from defrance69/patch-19 
Add project and task boxes
 2014-06-26 22:03:38 +02:00
Laurent Destailleur
534e574379 Merge pull request #1668 from aspangaro/develop-dons 
Move donation receipt to french model cerfa 11580*03
 2014-06-26 22:03:13 +02:00
Laurent Destailleur
656dd94011 Merge pull request #1657 from mkdgs/patch-1 
Add customers/supplier status fo contact export
 2014-06-26 21:58:23 +02:00
Laurent Destailleur
79dec7ad90 Merge pull request #1641 from defrance69/patch-17 
Patch 17
 2014-06-26 21:43:45 +02:00
Laurent Destailleur
a79aa1f203 Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop 
Conflicts:
	htdocs/product/class/product.class.php
 2014-06-26 21:38:03 +02:00
BENKE Charles
fa75ef3b57 made change on all the modules_element definition 2014-06-21 00:35:11 +02:00
Laurent Destailleur
8d1fdec8cf Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/fiche.php
	htdocs/projet/fiche.php
 2014-06-20 15:26:02 +02:00
Laurent Destailleur
fcb00b2024 Fix: [ bug #1425 ] 2014-06-20 13:38:44 +02:00
Laurent Destailleur
51eb761b02 Merge pull request #1669 from aspangaro/develop-patch1 
Correction on 3.6beta
 2014-06-20 13:12:39 +02:00
Laurent Destailleur
8ce8bf47ee Fix: The object deliverycompany was not used anymore and output of 
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.

Conflicts:
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
 2014-06-20 12:48:08 +02:00
Laurent Destailleur
4087781236 Fix: The object deliverycompany was not used anymore and output of 
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.
 2014-06-20 12:41:23 +02:00
BENKE Charles
66dc82621d Update modProjet.class.php 
add boxe definition on projet module
 2014-06-18 21:37:56 +02:00
Florian HENRY
df9f153142 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
 2014-06-17 12:01:45 +02:00
aspangaro
e469755d29 Divers 2014-06-16 06:17:46 +02:00
aspangaro
f4efd3b2e8 Move donation receipt to french model cerfa 11580*03 2014-06-15 22:18:19 +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
ca0a6cb307 Removed SQL string from call debug log 2014-06-13 01:34:39 +02:00
Florian HENRY
40a5d20cc8 Do not reset index on product import !!! 2014-06-12 16:46:20 +02:00
Marcos García de La Fuente
7e7958cf73 Removed SQL errors as they are logged by the database handler 2014-06-12 13:49:05 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Florian HENRY
80facefa23 Fix [ bug #1454 ] Mention de bas de page erroné 2014-06-12 09:13:51 +02:00
Mickael Desgranges
57b4cb08b7 Update modSociete.class.php 2014-06-11 13:28:31 +02:00
Mickael Desgranges
81e715f34c Update modSociete.class.php 2014-06-11 12:26:54 +02:00
Mickael Desgranges
84f1b8c02b Add customers/supplier status fo contact export 
When you export a contact list it's usefull to know if your contact is a prospect, client or supplier
 2014-06-11 12:22:24 +02:00
Marcos García de La Fuente
ae4bd4445e Moved dol_syslog query log to the database handler and decreased report level to DEBUG 2014-06-09 15:49:54 +02:00
Laurent Destailleur
b124007c8c Merge remote-tracking branch 'origin/3.5' into develop 2014-06-09 15:30:41 +02:00
BENKE Charles
f806b4373a Update modules_commande.php 
don't display specific version
 2014-06-06 15:30:33 +02:00
BENKE Charles
37c908aa99 Update modules_propale.php 
don't display specific number of version
 2014-06-06 15:29:45 +02:00
Laurent Destailleur
171227e43a Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2014-06-06 12:00:21 +02:00
Florian HENRY
ebe49b0525 Same bug, missing select column use in result 2014-06-05 10:58:38 +02:00
Florian HENRY
e8f8644bf4 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-06-05 10:53:20 +02:00
Florian HENRY
44a1059158 Fix warining message during societe activation 2014-06-05 10:53:00 +02:00
Marcos García de La Fuente
4c11e37203 Fix: [ bug #1434 ] Muscadet supplier order document model linked objects overlap the text 2014-06-03 15:45:03 +02:00
aspangaro
bb4fed30a8 Salaries :: Missing key language & typo 2014-06-03 06:45:37 +02:00
Laurent Destailleur
ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
 2014-05-29 19:20:48 +02:00
Florian HENRY
d304c7785e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/modules/mailings/pomme.modules.php
 2014-05-29 14:28:01 +02:00
Florian HENRY
c19eabf711 Better target emailing status mangement 2014-05-29 14:26:27 +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
Raphaël Doursenaud
12fed4f4d7 Fix: CRLF 2014-05-26 12:32:33 +02:00
Laurent Destailleur
4b9d1b901b Fix: [ bug #1401 ] Problème avec la génération des codes barres 2014-05-25 17:14:33 +02:00
Laurent Destailleur
07bc933110 Merge branch 'bug-1405' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1405

Conflicts:
	ChangeLog
 2014-05-23 20:21:41 +02:00
Laurent Destailleur
2771c506e9 Merge branch 'bug-1407' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1407

Conflicts:
	ChangeLog
 2014-05-23 20:17:41 +02:00
Marcos García de La Fuente
fa733c8ba4 Fix: [ bug #1405 ] Rouget PDF expedition incorrect when two expeditions under the same commande 2014-05-23 11:42:14 +02:00
Marcos García de La Fuente
9cc74c36d2 Missing copyright info 2014-05-23 02:45:15 +02:00
Marcos García de La Fuente
77c09d887a Fix: [ bug #1407 ] Rouget pdf overlapped when using tracking number and public notes 2014-05-23 02:44:02 +02:00
Laurent Destailleur
3f96632e02 Fix: CRLF 2014-05-21 20:34:52 +02:00
Laurent Destailleur
94335b186e Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/modules/propale/mod_propale_marbre.php
 2014-05-21 20:30:07 +02:00
Laurent Destailleur
4a7e9e4d0b Fix: CRLF 2014-05-21 19:54:40 +02:00
Laurent Destailleur
366bd64c4f Fix: When number reach 9999 with default numbering module, next number 
will be 10000 instead of 0000 and error.
 2014-05-21 19:44:53 +02:00
Laurent Destailleur
ff46adf284 Merge pull request #1607 from GPCsolutions/3.6b-review 
3.6b review
 2014-05-19 16:07:49 +02:00
Laurent Destailleur
e09cc127fd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-19 15:10:46 +02:00
Raphaël Doursenaud
c83a0309b1 Barcode: fixed wrong menu 2014-05-19 14:38:26 +02:00
Raphaël Doursenaud
13cb2e478f Contracts module configuration: missing translation string 2014-05-19 14:37:30 +02:00
Laurent Destailleur
b7f55ea99c Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/liste.php
 2014-05-18 11:52:52 +02:00
Laurent Destailleur
00dd7db75e Fix: Miscellaneous fixes into emailing target selectors (missing field 
name, missing translation, sql syntax error, missing fiels other)
 2014-05-17 19:43:22 +02:00
Laurent Destailleur
eec5d6d313 Fix: Error management of mass email feature 2014-05-17 19:02:47 +02:00
Laurent Destailleur
f7d1e93136 Move module to status development 2014-05-14 12:27:09 +02:00
Laurent Destailleur
0027dc30f5 Fix: Modules into core should never, by definition, activate hooks 
(hooks are architecture solution for external module)
 2014-05-14 12:14:18 +02:00
Laurent Destailleur
757d92a318 Merge pull request #1589 from aternatik/resource_core 
Core integration of resource module
 2014-05-14 11:25:25 +02:00
Laurent Destailleur
5f0c4dbe48 Fix: TCPDF error file not found in member card generation 2014-05-12 10:07:57 +02:00
Laurent Destailleur
6b1bdf9913 Merge pull request #1587 from aternatik/odt_thirdpartycontact 
Fix : bad call of extrafields into contact substitution
 2014-05-12 01:53:41 +02:00
Laurent Destailleur
d4534f4a0b Fix: [ bug #1384 ] Wrong name for import products and product prices 2014-05-11 17:52:16 +02:00
Marcos García de La Fuente
7b05944530 Corrected strings not translated and typos in English language 2014-05-11 13:14:45 +02:00
jfefe
45aa1b9136 Use hook for resource card 2014-05-11 12:11:58 +02:00
jfefe
901c083ce6 Fix : bad link to list into resource menu 2014-05-11 00:26:54 +02:00
Jean-François Ferry
6a9bf009f2 Clean code 2014-05-10 22:07:13 +02:00
Jean-François Ferry
c5e02edfa8 Add submenu for adding resource 2014-05-10 22:06:23 +02:00
Jean-François Ferry
1caffcffaf Add new perm to link resource to an element 2014-05-10 22:06:23 +02:00
Jean-François Ferry
c04812cd15 Fix: bad lang file 2014-05-10 22:06:22 +02:00
Jean-François Ferry
e76ce87547 Remove unused css 2014-05-10 22:03:05 +02:00
Jean-François Ferry
6e24004e82 Remove resource module config page 2014-05-10 22:03:05 +02:00
Jean-François Ferry
e63f8b87c1 Mark resource module as experimental / need Dolibarr 3.5 2014-05-10 22:03:05 +02:00
Jean-François Ferry
d9c567ca3d Prepare structure for upstream merge 2014-05-10 22:03:05 +02:00
Laurent Destailleur
12055aa44a I did a better fix to have no more dependencies between modules. 2014-05-10 19:04:33 +02:00
Laurent Destailleur
c20a5d7e18 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-10 19:02:55 +02:00
Laurent Destailleur
f95c87f1d6 Fix: [ bug #1374 ] Salaries module requires "Special costs" module to 
work but it does not enable it
 2014-05-10 18:57:04 +02:00
jfefe
31044f1f72 Fix : bad call of extrafields into contact substitution (works with socpeople) 2014-05-10 18:51:54 +02:00
Juanjo Menent
4e53b57313 Fix: [ bug #1374 ] Salaries module requires "Special costs" module to 
work but it does not enable it
 2014-05-10 17:54:13 +02:00
Laurent Destailleur
40577ab445 New: Can enter holiday for someone else if user has permission for. 2014-05-07 15:03:05 +02:00
Laurent Destailleur
9add45aea3 Qual: Mutualize code. 2014-05-07 13:22:02 +02:00
Laurent Destailleur
845f764f93 Increase default size of image 2014-05-07 12:21:14 +02:00
Marcos García de La Fuente
8681079fa7 Fixed CR 2014-05-07 10:42:13 +02:00
Laurent Destailleur
182dd774b6 Fix: phpunit regression 2014-05-07 09:54:36 +02:00
Laurent Destailleur
95b5094e94 Fix: phpunit regression 2014-05-07 09:33:56 +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
99dc3598de Fix: [ bug #1364 ] Duplicate Id on permission 2014-05-06 23:27:44 +02:00
Laurent Destailleur
647d431857 Fix: contact of delivery of order not visible into typhon pdf. 2014-05-06 13:43:41 +02:00
Laurent Destailleur
959b104b78 Fix: the pdf template name for typhon as not correctly set when enabling 
module.
 2014-05-06 13:31:30 +02:00
Laurent Destailleur
63100c9c06 Properties "civilite_id" were renamed into "civility_id". 2014-05-05 00:23:09 +02:00
Laurent Destailleur
697f68c9a9 Merge branch '3.5' of github.com:FHenry/dolibarr into FHenry-3.5 
Conflicts:
	ChangeLog
 2014-05-04 17:43:47 +02:00
Laurent Destailleur
03f9f0bada Fix: Pb of records not correctly cleaned when module marge is 
uninstalled (conflict between 'margin' and 'margins').
 2014-05-03 20:21:35 +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
50c10d3d1e Fix: Can disable features with PHPEXCEL (no DLSF compatible). 
Fix: Can disable features with CKEDITOR.
 2014-05-03 02:20:26 +02:00
Laurent Destailleur
43253d877a Fix: Can disable features with PHPEXCEL (no DLSF compatible). 
Fix: Can disable features with CKEDITOR.
 2014-05-03 02:15:33 +02:00
Laurent Destailleur
d97c45a9b8 Add version of phpunit into travis script. 
Fix: strict mode.
 2014-05-01 19:17:45 +02:00
Florian HENRY
2637305065 same 2014-05-01 18:15:32 +02:00
Florian HENRY
a4126fae66 [ bug #1341 ] Lastname not added by file or direct input in mass 
e-mailing
 2014-05-01 18:13:01 +02:00
Laurent Destailleur
0219d53f69 Merge branch 'odt_thirdpartycontact' of github.com:aternatik/dolibarr into aternatik-odt_thirdpartycontact 2014-05-01 11:22:32 +02:00
Laurent Destailleur
6a200105b9 Merge branch 'develop' of github.com:aspangaro/dolibarr into 
aspangaro-develop

Conflicts:
	ChangeLog
 2014-05-01 11:16:42 +02:00
Laurent Destailleur
3719fc1234 Merge pull request #1557 from defrance69/develop 
export extrafields on bill & set real ref bordereau number
 2014-05-01 11:09:16 +02:00
Laurent Destailleur
569d4cfd41 Merge pull request #1556 from FHenry/develop 
Enable option clone target emailing
 2014-05-01 11:08:05 +02:00
aspangaro
501b7209de Move module trips into family "hr" 2014-05-01 04:57:49 +02:00
jfefe
fd45bb16bd Fix : make ODT substitution for company after contacts 2014-04-30 19:18:51 +02:00
Jean-François Ferry
00cd616f4c Add informations about contacts of thirdparty into ODT 2014-04-30 10:36:23 +02:00
Laurent Destailleur
19d71ffb38 Prepare fix to hide images generated by "preview" feature. 2014-04-29 21:14:55 +02:00
BENKE Charles
468f6fd5fb Update modFournisseur.class.php 
Add extrafields export feature on bill
 2014-04-29 11:57:51 +02:00
BENKE Charles
b283ed73d1 Update modFacture.class.php 
add export extrafields feature
 2014-04-29 11:53:04 +02:00
Florian HENRY
7a46bdfc55 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2014-04-28 17:20:40 +02:00
Florian HENRY
dddbc37d35 Enable option clone target emailing 2014-04-28 17:18:11 +02:00
Laurent Destailleur
4a23a8a789 Merge branch 'category_translate' of github.com:aternatik/dolibarr into 
aternatik-category_translate

Conflicts:
	ChangeLog
 2014-04-28 02:39:56 +02:00
Laurent Destailleur
e5c5b15ecc Qual: Start to clean module ECM (Code is to complex). Prepare for 
replacement with another tool.
New: A module can add its own ECM view.
New: A module can disable a standard ECM view.
 2014-04-28 01:46:11 +02:00
Laurent Destailleur
97fce71218 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
	htdocs/product/fiche.php
	htdocs/projet/tasks/task.php
 2014-04-26 22:35:35 +02:00
Laurent Destailleur
bd8cdd337a Fix: Option MAIN_INVERT_SENDER_RECIPIENT broken with typhon template. 2014-04-26 22:17:11 +02:00
jfefe
afaf5698a5 Fix : bad link to categorie admin page 2014-04-25 14:25:49 +02:00
Raphaël Doursenaud
a57b7d4ed2 Qual: Derived missing variable from a known one 2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
7852020b3d Qual: Missing global declaration 2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
490b45ea7e Qual: Wrong type in method documentation 2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
e3fa0332f4 Qual: Missing global declaration 2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
167457562e Qual: Wrong variable name 2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
8f215205fa Qual: Wrong type in method documentation 2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
79e2bf4737 Qual: Missing global declaration 2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
c4569b10d0 Qual: Wrong variable name 2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
10a0994241 Qual: Wrong type in method documentation 2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
370996d5c4 Qual: Wrong type in method documentation 2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
32f5ecfaa3 Qual: Wrong type in method documentation 2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
6366a66efd Qual: Wrong type in method documentation 2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
9bb454b242 Qual: Wrong variable name 2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
953e196a2c Qual: Missing variable declaration 2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
f357d3c5ab Qual: Missing global declaration 2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
aa1ff28158 Qual: Missing global declaration 2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
22263dc2c1 Qual: Missing global declaration 2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
e738a294e8 Qual: Wrong variable name 2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
1d52f6d6c2 Qual: Fixed typo 2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
e561cc87f7 Qual: Wrong variable name 2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
2abbc8845f Qual: Missing global declaration 2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
0d92abc037 Qual: Missing global declaration 2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
2cfe27b434 Qual: Wrong type in method documentation 2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
6174099827 Qual: Wrong type in method documentation 2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
858d1dc8d0 Qual: Missing variable declaration 2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
db82a6f0e6 Qual: Missing global declaration 2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
988e7a137e Qual: Missing global declaration 2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
f476bee0c7 Qual: Missing variable declaration 2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
20983b4807 Qual: Removed unused variable 2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
7497a72b1d Qual: Removed dead code 2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
4f3a28e7ed Qual: Removed unused variable 2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
5d74a5a852 Qual: Wrong variable name 2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
70606d04ea Qual: Missing global declaration 2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
e7d9423812 Qual: Wrong variable name 2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
126d2522fd Qual: Missing global declaration 2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
aacd657972 Qual: Wrong variable name 2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
96e12e75bb Qual: Missing variable declaration 2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
9c5db27a70 Qual: Wrong type in method documentation 2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
592b738f96 Qual: Missing global declaration 2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
71cd774d04 Qual: Missing global declaration 2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
9960e5aa8f Qual: Removed unused variable 2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
1757c9d45e Qual: Missing global declaration 2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
0a08f3c6e3 Qual: Missing global declaration 2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
12ba751432 Qual: Missing global declaration 2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
0cb58e0b52 Qual: Wrong variable name 2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
8b5b7203d5 Qual: Missing global declaration 2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
32ced9a502 Qual: Removed missing variable 2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
3a7773081e Qual: Missing method arguments 2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
11125f98be Qual: Missing global declaration 2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
d1f59b73d7 Qual: Wrong variable name 2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
b3630cc588 Qual: Missing variable declaration 2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
2970ead6f3 Qual: Wrong type in method documentation 2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
119e96a8b1 Qual: Missing global declaration 2014-04-23 18:24:03 +02:00
Raphaël Doursenaud
f4f4eca841 Qual: Wrong variable name 2014-04-23 18:24:03 +02:00
Raphaël Doursenaud
9e839f43e6 Qual: Wrong type in method documentation 2014-04-23 18:24:03 +02:00
Raphaël Doursenaud
fe05d3f2c4 Qual: Missing global declaration 2014-04-23 18:24:03 +02:00
BENKE Charles
0b78a04756 Update doc_generic_project_odt.modules.php 2014-04-19 12:32:01 +02:00
Laurent Destailleur
bb2c829997 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
 2014-04-18 12:34:32 +02:00
Laurent Destailleur
ee3592c976 Fix: invert label for accountancy_code_sell 2014-04-18 11:21:15 +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
Laurent Destailleur
7fcf57ca5a Fix: SQL request for export. Extra field missing. 2014-04-10 18:36:34 +02:00
Laurent Destailleur
60b37dffe1 Fix: [ bug #1323 ] generation of odt files for tasks. 2014-04-09 00:07:32 +02:00
Laurent Destailleur
cf8ff97855 Fix: Install of odt templates for project and tasks failed. 2014-04-02 13:17:20 +02:00
Laurent Destailleur
7ac193bb80 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/opensurvey/public/choix_autre.php
 2014-04-02 11:41:55 +02:00
Laurent Destailleur
1fad693867 Fix: Removed useless strtolower 2014-03-31 02:25:35 +02:00
Laurent Destailleur
b675b9b610 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/fourn/facture/fiche.php
	htdocs/langs/en_US/admin.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/projet/tasks/task.php
 2014-03-31 00:44:45 +02:00
Laurent Destailleur
4d4512fadd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-26 22:14:14 +01:00
Laurent Destailleur
62a990d6cc Fix: ajax_combobox function must be included before called. 
New: Feature of module survey are now localized into top menu "Tools".
 2014-03-26 16:02:22 +01:00
Laurent Destailleur
f115501ddf Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-03-24 00:16:47 +01:00
Laurent Destailleur
466de67b5b Fix: Solve pb of too many embedded tables 2014-03-23 20:18:07 +01:00
Laurent Destailleur
a1e778c146 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-03-21 21:12:02 +01:00
Laurent Destailleur
1061a650d2 Fix: duplicate info 2014-03-21 21:11:51 +01:00
Laurent Destailleur
b2f6498236 Merge remote-tracking branch 'origin/3.5' into develop 2014-03-21 15:03:37 +01:00
Laurent Destailleur
a884673637 Fix: A better to fix to manage automatic creation of code for import. 2014-03-21 13:29:13 +01:00
Laurent Destailleur
f9c1b590d0 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	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/facture.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/filefunc.inc.php
 2014-03-19 22:29:18 +01:00
Laurent Destailleur
d3e951e1ec Merge remote-tracking branch 'origin/3.4' into 3.5 2014-03-19 20:22:04 +01:00
Laurent Destailleur
2cced0bf43 Perf: Avoid makign a "desc table" for each row we import (for this we 
are using a global cache array).
 2014-03-19 20:02:39 +01:00
Laurent Destailleur
062c150bc1 Fix: import of fields with value "auto" 2014-03-19 19:33:43 +01:00
Laurent Destailleur
212deb9e1c Fix: fails to import when value is 'AUTO' because compare was case 
sensitive.
 2014-03-19 17:15:18 +01:00
Laurent Destailleur
2f10198064 Fix: Option MAIN_PDF_DASH_BETWEEN_LINES was not working when tcpdf was 
making a pagebreak higher than 2 pages.
 2014-03-19 16:36:12 +01:00
Laurent Destailleur
bf735cacbe Fix PDF: Page break was ko when breaking 2 pages or more. 
Fix PDF: pdf_canelle was missing code to manage pagebreak.
Fix PDF: The width of picture was hardcoded into some templates.
Fix PDF: The atleastonediscount was not used into some templates.
 2014-03-19 13:32:54 +01:00
Laurent Destailleur
80088c87ac Fix: Some debugs of module categories 2014-03-18 00:20:39 +01:00
Laurent Destailleur
2889c3ac70 Qual: Feature to make payment of salaries has been moved into a module 
(module dedicated to manage salaries and salary payments).
Qual: Also module for employee to declare trip and expenses has been
moved into same place than module for employee to declare holidays
(into HRM top entry). It is not an accountancy module so no reason to
have it into entry "Accountancy".
 2014-03-17 14:30:55 +01:00
Laurent Destailleur
7974ae96ad Merge branch 'cat_extrafields' of https://github.com/aternatik/dolibarr 
into aternatik-cat_extrafields

Conflicts:
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
 2014-03-16 21:38:29 +01:00
Laurent Destailleur
ed4f7fd083 Fix: error 2014-03-16 20:05:07 +01:00
Laurent Destailleur
2d3c700a7d Fix: When cloning product, autogenerating barcode must not use same 
number.
Qual: Moved dedicated permission of module to "advance" permissions.
 2014-03-16 17:37:54 +01:00
Jean-François Ferry
55750e16d8 Prepare extrafields into categories 2014-03-16 14:48:46 +01:00
Maxime Kohlhaas
685c00cd27 Fix : Delivery date was displayed twice 2014-03-15 17:55:57 +01:00
Florian Henry
7625629491 Fix [ bug #1294 ] Expedition model Merou having problems with long names 2014-03-15 16:40:29 +01:00
Florian Henry
18c4d890dd Fix [ bug #1283 ] ROUGET Shipment PDF 2014-03-15 16:32:46 +01:00
Florian Henry
3f6b319d41 Fix deposit invoice 2014-03-14 23:42:45 +01:00
philippe grand
f9c48be2a9 fix : display specimen 2014-03-14 18:23:37 +01:00
Laurent Destailleur
32364ac18b Move skype module from experimental to stable. 2014-03-14 15:26:26 +01:00
Laurent Destailleur
4154f07dfd New: Add a public url as a property for products/services. 2014-03-14 13:51:46 +01:00
Marcos García de La Fuente
4433f6e8b7 Missing copyright info 2014-03-06 09:01:44 +01:00
Marcos García de La Fuente
c7566893a3 Corrected array indentation 2014-03-06 08:56:28 +01:00
Marcos García de La Fuente
2c22c7707f Created locale ODT line tags for invoice, shipment and order modules, and corrected the use of line_price_ht, line_price_ttc and line_price_vat tags 2014-03-06 08:55:37 +01:00
Laurent Destailleur
16a074a69b Use better module id number 2014-03-05 12:25:31 +01:00
KreizIT
7f275dfbf4 - Add table modification for product (forget in step 1) 
- Add module for batch number management
- change dependency for stock and product
- change product class and fiche showing new select for batch managment on product
 2014-03-04 18:55:55 +01:00
Laurent Destailleur
fd9d0747c8 Fix: Bad description 2014-03-02 16:44:31 +01:00
Laurent Destailleur
b64a2b2718 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-28 21:43:29 +01:00
BENKE Charles
303c459777 Update modProjet.class.php 
bad incrementation
 2014-02-27 11:29:08 +01:00
Laurent Destailleur
193a551b0a Merge pull request #1421 from defrance69/patch-30 
Update modProjet.class.php
 2014-02-27 11:19:28 +01:00
Laurent Destailleur
06b1c8b64a Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
 2014-02-27 10:47:15 +01:00
philippe
5c4ceb1a53 anglicized 2014-02-27 10:06:11 +01:00
philippe
1223e6a08b anglicized 2014-02-27 09:54:31 +01:00
Laurent Destailleur
4be679a7b2 Second try for Fix: The delivery date was missing. 2014-02-26 17:25:32 +01:00
Laurent Destailleur
480b09f192 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/societe/class/societe.class.php
 2014-02-26 15:49:29 +01:00
Laurent Destailleur
9505f9e47c Fix: The delivery date was missing. 2014-02-26 15:41:56 +01:00
Laurent Destailleur
a822bc0736 Fix: The delivery date was missing. 2014-02-25 19:22:00 +01:00
Laurent Destailleur
abff284ab1 Fix: The delivery date was missing. 2014-02-25 19:07:42 +01:00
Laurent Destailleur
7241714551 Merge pull request #1435 from marcosgdf/export-translations 
Corrected export translations
 2014-02-25 14:11:40 +01:00
Marcos García de La Fuente
f7eb4c5b14 Updated user export labels 2014-02-25 04:39:41 +01:00
Marcos García de La Fuente
4411908b23 Fixed translations of project export wizard 2014-02-25 04:18:13 +01:00
Florian Henry
46ae5d6e9c - New: Price management enhancement (multiprice level, price by 
customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
- Fix: Project Task numbering rule customs rule works
 2014-02-23 16:16:47 +01:00
Laurent Destailleur
e5136487bd Fix: The customer code was set to uppercase when using numbering module 
leopard. We must keep data safe of any change.
 2014-02-20 16:51:37 +01:00
Laurent Destailleur
96e7985266 Fix: Translation of menu entries must not be into admin lang file (We 
don't want to load this file for common pages).
 2014-02-19 02:27:13 +01:00
Laurent Destailleur
2e67bbc382 Maxi debug of barcode feature. 
New: Barcode format and mandatory requirement is checked.
New: Start to add new page for barcode init.
 2014-02-19 01:51:19 +01:00
Laurent Destailleur
03d056319c Qual: Clean code for adding menu entries into Modules system admin 
entry.
New: Add entry for admin page Mass barcode init.
 2014-02-18 20:49:22 +01:00
BENKE Charles
8ac8af0f40 Update modProjet.class.php 
bad incrementation
 2014-02-17 12:12:18 +01:00
Laurent Destailleur
46e9b5d550 Merge branch 'develop' of https://github.com/grandoc/dolibarr into 
grandoc-develop

Conflicts:
	htdocs/langs/ar_SA/admin.lang
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/tr_TR/admin.lang
 2014-02-10 01:30:48 +01:00
Laurent Destailleur
ce8d13ead0 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/makepack-dolibarr.pl
	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/comm/action/fiche.php
	htdocs/filefunc.inc.php
	htdocs/install/check.php
 2014-02-10 00:38:10 +01:00
Laurent Destailleur
bd25a98e03 New: Generation auto of barcode is available for product. 2014-02-10 00:24:20 +01:00
Laurent Destailleur
b94f7a6a6d Fix some amount were missing local version. 2014-02-08 03:51:30 +01:00
Laurent Destailleur
b714347b6b Fix: Substition of extra field was ko for order. 2014-02-08 01:01:31 +01:00
Laurent Destailleur
43970b3bd6 Removed some TODO 2014-02-06 20:45:50 +01:00
Grand Philippe
1855ba556a fix misspelled words 2014-02-05 17:53:30 +01:00
Laurent Destailleur
ba931e18d4 Work on barcode number generation. 
Normalize code for barcode module.
 2014-01-31 18:12:54 +01:00
Laurent Destailleur
a2afea7ba9 Work on barcode number generation. 
Normalize code for barcode module.
 2014-01-30 18:21:04 +01:00
Laurent Destailleur
85436f871c Sec: Missing permission tests 2014-01-30 11:48:14 +01:00
Laurent Destailleur
8abde9e11f Sec: Missing permission tests 2014-01-30 11:44:31 +01:00
Laurent Destailleur
bb1575e0e6 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-24 10:20:03 +01:00
Laurent Destailleur
3852fe4a1c Merge pull request #1380 from atm-alexis/3.5 
Add right to export project in export tool
 2014-01-21 04:30:35 -08:00
Laurent Destailleur
0a372a1c7d Merge remote-tracking branch 'origin/3.5' into develop 2014-01-21 13:26:05 +01:00
Laurent Destailleur
9519c89110 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-01-21 13:23:27 +01:00
Léo
46926aa685 Fix: modBarcode issue with blank list in conf (?) 
Custom DB prefix not working with barcode module ? Might help.
 2014-01-21 13:19:32 +01:00
Maxime Kohlhaas
60e616f63e Fix : big bug while importing thirds, codes were not properly set or not imported 2014-01-21 10:29:35 +01:00
Léo
6c00fc33f2 Fix: modBarcode issue with blank list in conf (?) 
Custom DB prefix not working with barcode module ? Might help.
 2014-01-21 00:54:26 +01:00
Laurent Destailleur
8d8e016115 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-20 02:42:37 +01:00
Laurent Destailleur
0d18892506 Merge from 3.4 2014-01-20 02:21:30 +01:00
Laurent Destailleur
1ebd56c4ee New: Add option MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE 2014-01-20 00:40:01 +01:00
Laurent Destailleur
5f58bff981 Use _ instead of - for option SUPPLIER_REF_IN_NAME 2014-01-19 22:59:37 +01:00
Laurent Destailleur
cbf6e8563d New: Add option SUPPLIER_REF_IN_NAME 2014-01-19 22:00:02 +01:00
Christophe Battarel
0bdcd108f5 Add supplier informations in product export (supplier name, supplier product ref and supplier unit price) 2014-01-16 11:04:56 +01:00
Laurent Destailleur
ad5fc43e5b doxygen 2014-01-15 18:20:24 +01:00
Alexis Algoud
9a5b46330a Add right to export project in export tool 
As the right does not exist, the tool could never be exploited
 2014-01-15 14:49:22 +01:00
Laurent Destailleur
bd1a10c116 Fix: doxygen 2014-01-14 16:49:06 +01:00
BENKE Charles
28204d66b1 Update modFacture.class.php 
remplace price by subprice on export invoice
 2014-01-12 14:59:23 +01:00
Laurent Destailleur
77688100bd Merge pull request #1372 from defrance69/patch-23 
Update modFacture.class.php
 2014-01-12 05:58:04 -08:00
Laurent Destailleur
06aa3b8250 Merge branch 'opensurvey-improvements' of 
https://github.com/marcosgdf/dolibarr into
marcosgdf-opensurvey-improvements

Conflicts:
	ChangeLog
 2014-01-12 14:50:00 +01:00
BENKE Charles
dd3da37ce6 Update modFacture.class.php 
remplace price by subprice on export invoice
 2014-01-10 10:35:42 +01:00
Laurent Destailleur
c0c555b78f Fix: A lot of fix into sticker sheet dimension management. 
Fix: Size of font too large to print sticker pages.

Conflicts:
	htdocs/core/modules/member/doc/pdf_standard.class.php
	htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
 2014-01-08 15:16:56 +01:00
Laurent Destailleur
622fe72abf Fix: A lot of fix into sticker sheet dimension management. 
Fix: Size of font too large to print sticker pages.
 2014-01-08 15:13:41 +01:00
Laurent Destailleur
c7ef0b7c57 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/societe/consumption.php
 2014-01-07 16:41:00 +01:00
Laurent Destailleur
e99883f1a6 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/admin/modules.php
 2014-01-06 19:18:06 +01:00
Laurent Destailleur
5b63b56143 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
 2014-01-06 19:13:40 +01:00
Marcos García de La Fuente
2393e7c732 Moved creation poll wizard out of public folder 2014-01-05 19:03:33 +01:00
Marcos García de La Fuente
8d96675607 Force logged user to create surveys and applied Dolibarr style to poll creation wizard 2014-01-05 09:08:42 +01:00
Marcos García de La Fuente
6397b0b7aa Improving the use of permissions in opensurvey module 2014-01-05 06:18:26 +01:00
Laurent Destailleur
5a7fe6b4a7 Fix: Change to make debian package ok despite removal of ckeditor 
package.
 2014-01-05 01:17:38 +01:00
Laurent Destailleur
ee1e7471ff Fix: A lot of bug into generation of sticker pages or address pages 
form members module:
- Position of element was wrong for non A4 pages.
- Removed bugged definition of 5164 sticker template.
- Solve problem of image proportions.
- Margin of right was wrong.

Conflicts:
	htdocs/core/modules/member/doc/pdf_standard.class.php
	htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
 2014-01-04 16:17:47 +01:00
Laurent Destailleur
918c5ff405 Fix: A lot of bug into generation of sticker pages or address pages 
form members module:
- Position of element was wrong for non A4 pages.
- Removed bugged definition of 5164 sticker template.
- Solve problem of image proportions.
- Margin of right was wrong.
 2014-01-04 16:13:34 +01:00
Laurent Destailleur
f6cda9deb6 Fix: The scale was hardcoded. 
Comment in english
 2014-01-04 12:40:13 +01:00
Laurent Destailleur
6c3c66c45d New: Add menu entry to barcode genration page. 2014-01-04 12:29:20 +01:00
Laurent Destailleur
bea74e54c8 Fix: The scale was hardcoded. 
Comment in english
 2014-01-04 12:26:31 +01:00
Marcos García de La Fuente
694fd5810a Removed unuseful opensurvey admin page 2014-01-03 00:44:56 +01:00
Laurent Destailleur
601b2744e0 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	build/debian/changelog
 2014-01-03 00:16:29 +01:00
Laurent Destailleur
4a4084e096 Fix: doxygen 2014-01-03 00:13:16 +01:00
Laurent Destailleur
76f890b72f Fix: Call Image on this instead of pdf. 
Fix: Missing parameter for photo.

Conflicts:
	htdocs/core/modules/member/doc/pdf_standard.class.php
	htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
 2014-01-02 20:51:39 +01:00
Laurent Destailleur
0b3dd9d7bb Fix: Call Image on this instead of pdf. 
Fix: Missing parameter for photo.

Conflicts:
	htdocs/core/modules/member/doc/pdf_standard.class.php
	htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
 2014-01-02 20:49:36 +01:00
Laurent Destailleur
5551a5d4b4 Fix: Call Image on this instead of pdf. 
Fix: Missing parameter for photo.
 2014-01-02 20:45:59 +01:00
Laurent Destailleur
f0151ce112 Merge remote-tracking branch 'origin/3.5' into develop 2013-12-30 12:44:46 +01:00
Laurent Destailleur
cfb791c584 Fix: Better translation 2013-12-29 19:30:11 +01:00
Laurent Destailleur
0e62d79ce2 Merge remote-tracking branch 'origin/3.5' into develop 2013-12-26 19:43:31 +01:00
Laurent Destailleur
fcfe94d4ec Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/product/liste.php
 2013-12-24 16:28:27 +01:00
Laurent Destailleur
ec1aef0191 Fix: Can import contacts not linked to any thirdparties. 2013-12-24 16:11:23 +01:00
Laurent Destailleur
11e0fb8f7a Fix: Missing ref field into export. 2013-12-17 09:11:36 +01:00
Laurent Destailleur
c34e50114a Start to work on a basic print sticker tool 2013-12-15 03:23:10 +01:00
Laurent Destailleur
fbeb61861a Start to remove too low level permission. Philisophy of dolibarr is 
having a minum of permission. Starting to include one permission for
each field we manage should not be into core.
Also activation of "skype" field in a future should probably be
rewritten to support as several communication id (chat, skype,
hanghout) with only one feature.
 2013-12-14 20:58:03 +01:00
Laurent Destailleur
eaf151d7f5 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/.gitignore
	htdocs/contact/fiche.php
 2013-12-14 03:13:46 +01:00
Laurent Destailleur
8d872ab4fb Uniformize code and more comments 2013-12-14 00:24:43 +01:00
Laurent Destailleur
f804833b9c Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/core/modules/modFacture.class.php
 2013-12-08 22:38:10 +01:00
Laurent Destailleur
825640d645 Fix: Missing special code into export 2013-12-08 21:24:59 +01:00
Laurent Destailleur
4d9712ea4c Merge pull request #1318 from csalvador/develop-fichinterPDF 
Develop fichinter pdf
 2013-12-04 09:41:13 -08:00
Laurent Destailleur
b6386a3dce Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/tpl/objectline_add.tpl.php
 2013-12-01 16:08:03 +01:00
Grand Philippe
5b2f9af7dc fix management of all errors messages 2013-11-28 16:44:57 +01:00
Cédric Salvador
2b6a5508c7 debug the Soleil model 2013-11-22 09:51:48 +01:00
Cédric Salvador
eb04d8b076 show signature space on the last page only 2013-11-22 09:51:47 +01:00
BENKE Charles
1bb7ddc2b1 Update modAgenda.class.php 
export extensions
 2013-11-21 17:32:11 +01:00
Laurent Destailleur
358175b357 Merge remote-tracking branch 'origin/3.4' into develop 2013-11-20 23:48:06 +01:00
Florian Henry
f88e9425ec Remove useless code (the tag replacement into footer and header is 
already done by SetVar method)
 2013-11-20 14:01:43 +01:00
Regis Houssin
4c29bddfda Fix: wrong variable name 
Fix: restore address.class.php, this class is used
 2013-11-20 09:40:56 +01:00
Laurent Destailleur
b7190d2609 Fix: Several bugs. 2013-11-16 13:00:21 +01:00
aspangaro
86a2da31b4 Fix for document cerfa into module Don 2013-11-10 06:52:20 +01:00
aspangaro
6b6855dff5 Fix for document cerfa into module Don 2013-11-10 06:37:08 +01:00
Raphaël Doursenaud
c845124b92 Object type is lowercase 2013-11-07 21:47:13 +01:00
Grand Philippe
a14de0c035 fix : language 2013-11-05 15:29:33 +01:00
Laurent Destailleur
a9a2bd9eec Fix error reported by travis. 2013-11-05 14:39:25 +01:00
aspangaro
d79ba9695a Task 157 : Add a skype button 2013-11-04 21:41:36 +01:00
Laurent Destailleur
c51ff1d462 New: Add hidden option to disable log handlers. 2013-10-30 19:08:41 +01:00
Laurent Destailleur
93c5720579 New: Add path to installed dir of external modules + Name and web of 
module provider.
 2013-10-28 01:37:04 +01:00
Laurent Destailleur
966f135316 Fix: Migration must load new boxes 2013-10-26 16:18:28 +02:00
Laurent Destailleur
16bcd6b5e5 Add error management to avoid blank page when there is no permission to 
read file.
 2013-10-23 19:19:54 +02:00
Laurent Destailleur
ca560b4f98 Fix: [ bug #1076 ] Shipment/Delivery PDFs 2013-10-23 18:02:16 +02:00
Maxime Kohlhaas
845deb9a63 Add multilang management in ODT models 2013-10-08 09:17:04 +02:00
Laurent Destailleur
141258f514 Merge remote-tracking branch 'origin/3.4' into develop 
and fix syntax errors into sql requests.
Group by must ALWAYS contains fields that are not included into SUM or
COUNT

Conflicts:
	htdocs/fourn/product/liste.php
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
 2013-10-07 16:17:51 +02:00
Laurent Destailleur
db7bcfd748 Fix: Sending email from thirdparty must add event into agenda if option 
is on.
 2013-09-25 21:36:40 +02:00
Laurent Destailleur
072247f1c8 Fix: Use correct translation key 2013-09-25 19:07:25 +02:00
Laurent Destailleur
d111ee97c2 Doc 2013-09-25 12:37:19 +02:00
Laurent Destailleur
26bce0a385 Merge pull request #1207 from defrance69/patch-12 
Update modProjet.class.php
 2013-09-23 00:39:03 -07:00
Laurent Destailleur
b57ed72fc1 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2013-09-22 20:01:33 +02:00
Laurent Destailleur
c2ba7956ab Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2013-09-22 19:57:48 +02:00
Laurent Destailleur
ad09470f48 Fix: Better management of pdf generation when tcpdf not available. 2013-09-22 19:53:27 +02:00
Laurent Destailleur
9826b202e9 New: Provide both tags for string formated amount and numeric amount 
into odt templates.
New: [ task #923 ] Localtax support for ODT templates
 2013-09-16 12:42:01 +02:00
simnandez
59783cf556 [ task #1060 ] Register fields localtax(1|2)_type into details tables 2013-09-15 11:52:57 +02:00
simnandez
4c7907b773 [ task #1060 ] Register fields localtax(1|2)_type into details tables 2013-09-15 11:47:31 +02:00
BENKE Charles
5e9cb8a1d4 Update modProjet.class.php 
add export_dependencies_array
 2013-09-14 10:45:41 +02:00
Laurent Destailleur
d22985c5fa More accurate log file 2013-09-09 12:23:15 +02:00
Laurent Destailleur
3a8784a6de Qual: Mutualize code 2013-09-07 19:08:08 +02:00
Laurent Destailleur
d493dc8513 Merge pull request #1215 from GPCsolutions/develop-review 
Develop review
 2013-09-05 13:51:28 -07:00
Raphaël Doursenaud
0e8eddb470 Revert "Method should be static" 
This reverts commit 4ca5bc3797.
 2013-09-05 19:00:00 +02:00
Juanjo Menent
15bb60c8a1 Merge pull request #1212 from FHenry/develop 
Add ref supplier into muscadet model
 2013-09-05 08:30:49 -07:00
Raphaël Doursenaud
4efe215b0c Qual: removed a bunch of duplicated array keys 2013-09-05 17:00:18 +02:00
Raphaël Doursenaud
4ca5bc3797 Method should be static 2013-09-05 16:44:02 +02:00
Laurent Destailleur
10c2bdc193 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/langs/fr_FR/compta.lang
 2013-09-04 15:13:38 +02:00
Florian Henry
d8ddb8b3e7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-03 20:07:13 +02:00
Florian Henry
b4d858828f Add ref supplier into muscadet model 2013-09-03 20:07:08 +02:00
BENKE Charles
bb8f8332f9 Update modProjet.class.php 
enhance export feature with
left join and projet_task_time data
 2013-09-03 11:12:29 +02:00
Grand Philippe
da384dda18 uniformize 2013-09-02 11:53:07 +02:00
Laurent Destailleur
cb52af4f47 Qual: Make code more generic 2013-09-02 02:14:16 +02:00
Laurent Destailleur
1ba382d7a6 Merge pull request #1202 from FHenry/develop 
Fix from remark on https://github.com/Dolibarr/dolibarr/pull/1103
 2013-09-01 15:01:33 -07:00
Laurent Destailleur
a8096c7359 New: Export/import profile include state. 2013-08-31 12:43:41 +02:00
Florian Henry
9ed5653ae5 [ task #1044 ] Add option to enabled thirdparty number into select 
thirdparty list
 2013-08-30 18:18:58 +02:00
Florian Henry
29396bd51a Change SQL syntax 2013-08-28 18:05:31 +02:00
Florian Henry
34129598cb adjust spacing 2013-08-28 16:50:38 +02:00
Florian Henry
650689d294 Fix from remark on https://github.com/Dolibarr/dolibarr/pull/1103 2013-08-28 16:49:22 +02:00
Florian Henry
cc90c92cc0 Fix: Mailing module : if an email is already in destinaires list all 
other email from selector was not inserted
 2013-08-28 16:33:21 +02:00
simnandez
34fe1fba7f Fix: [ bug #1043 ] Bad interventions ref numbering 2013-08-27 09:45:24 +02:00
simnandez
dfd14f4430 Fix: [ bug #1043 ] Bad interventions ref numbering 2013-08-27 09:44:00 +02:00
Grand Philippe
24e6042378 some fix for contract model 2013-08-26 15:32:56 +02:00
Grand Philippe
7a64ad1a26 some fix for contract model and clean code 2013-08-26 14:29:46 +02:00
Laurent Destailleur
07cba2d232 Merge pull request #1194 from grandoc/develop 
fix : warning during install
 2013-08-24 13:43:36 -07:00
Laurent Destailleur
8c90ad8afa Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/modFacture.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
	htdocs/expedition/fiche.php
	htdocs/fourn/fiche.php
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/el_GR/agenda.lang
	htdocs/langs/el_GR/banks.lang
	htdocs/langs/el_GR/bills.lang
	htdocs/langs/el_GR/bookmarks.lang
	htdocs/langs/el_GR/boxes.lang
	htdocs/langs/el_GR/cashdesk.lang
	htdocs/langs/el_GR/categories.lang
	htdocs/langs/el_GR/commercial.lang
	htdocs/langs/el_GR/companies.lang
	htdocs/langs/el_GR/compta.lang
	htdocs/langs/el_GR/contracts.lang
	htdocs/langs/el_GR/cron.lang
	htdocs/langs/el_GR/deliveries.lang
	htdocs/langs/el_GR/dict.lang
	htdocs/langs/el_GR/donations.lang
	htdocs/langs/el_GR/ecm.lang
	htdocs/langs/el_GR/errors.lang
	htdocs/langs/el_GR/exports.lang
	htdocs/langs/el_GR/externalsite.lang
	htdocs/langs/el_GR/ftp.lang
	htdocs/langs/el_GR/help.lang
	htdocs/langs/el_GR/holiday.lang
	htdocs/langs/el_GR/install.lang
	htdocs/langs/el_GR/interventions.lang
	htdocs/langs/el_GR/languages.lang
	htdocs/langs/el_GR/ldap.lang
	htdocs/langs/el_GR/mailmanspip.lang
	htdocs/langs/el_GR/mails.lang
	htdocs/langs/el_GR/main.lang
	htdocs/langs/el_GR/margins.lang
	htdocs/langs/el_GR/members.lang
	htdocs/langs/el_GR/opensurvey.lang
	htdocs/langs/el_GR/orders.lang
	htdocs/langs/el_GR/oscommerce.lang
	htdocs/langs/el_GR/other.lang
	htdocs/langs/el_GR/paybox.lang
	htdocs/langs/el_GR/paypal.lang
	htdocs/langs/el_GR/products.lang
	htdocs/langs/el_GR/projects.lang
	htdocs/langs/el_GR/propal.lang
	htdocs/langs/el_GR/sendings.lang
	htdocs/langs/el_GR/shop.lang
	htdocs/langs/el_GR/sms.lang
	htdocs/langs/el_GR/stocks.lang
	htdocs/langs/el_GR/suppliers.lang
	htdocs/langs/el_GR/trips.lang
	htdocs/langs/el_GR/users.lang
	htdocs/langs/el_GR/withdrawals.lang
	htdocs/langs/el_GR/workflow.lang
	htdocs/margin/productMargins.php
 2013-08-24 22:41:32 +02:00
Grand Philippe
a0c04a548b first step to complete contract functionalities 2013-08-24 15:59:49 +02:00
Laurent Destailleur
9da5f7f47a Qual: Doxygen 2013-08-22 16:49:23 +02:00
Laurent Destailleur
05040d1997 Fix: B1032-develop: Problem in the filter of Contact by company category 2013-08-21 22:42:08 +02:00
Laurent Destailleur
f0dee93f78 Fix: B1032-develop: Problem in the filter of Contact by company category 2013-08-21 22:34:13 +02:00
Laurent Destailleur
52d39915d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-08-21 22:21:33 +02:00
Christophe Battarel
8128ed0556 define user permissions on margin module 
update changelog
 2013-08-20 12:00:16 +02:00
Laurent Destailleur
b18d5166de Fix: Size of picture into PDF 2013-08-19 13:30:30 +02:00
simnandez
5cbfa61731 Fix: [ bug #1033 ] SUPPLIER REF disappeared 2013-08-12 18:44:03 +02:00
simnandez
067c8c55b9 Fix: [ bug #1033 ] SUPPLIER REF disappeared 2013-08-12 18:42:01 +02:00
simnandez
6b1484c2ea Fix: [ bug #992 ] Proforma invoices don't have a separated numeric count 2013-08-08 17:11:54 +02:00
simnandez
b9e1a57f67 Fix: [ bug #1029 ] Tulip numbering mask 2013-08-08 10:00:06 +02:00
Laurent Destailleur
0f86755033 Fix: Found a dozen of bugs into sub module delivery of module shipment. 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/fiche.php
 2013-08-07 15:29:13 +02:00
Laurent Destailleur
d5a57f3717 Fix: Found a dozen of bugs into sub module delivery of module shipment. 2013-08-07 15:08:30 +02:00
Laurent Destailleur
4d67d02f33 Fix: Bad dir 2013-08-07 13:35:09 +02:00
Laurent Destailleur
539adfdcc4 Fix: Bad var name 2013-08-07 13:33:22 +02:00
Juanjo Menent
aab90bfe76 Merge pull request #1154 from atm-maxime/develop 
Fix : supplier invoice mask + numbering
 2013-08-06 06:37:32 -07:00
Maxime Kohlhaas
3586c41a8e Numbering should be on invoice date, not creation date 2013-08-06 15:29:20 +02:00
Maxime Kohlhaas
08a3b0c905 Fix : supplier invoice mask + numbering 2013-08-06 15:27:51 +02:00
Laurent Destailleur
c3dd7c3b39 Fix: Tons of regression after renaming note field into note_private. 2013-08-06 13:22:35 +02:00
Laurent Destailleur
2750b1a298 Fix: Tons of regression after renaming note field into note_private. 
Qual: Add phpunit test to test all exports descriptors.
 2013-08-06 13:22:00 +02:00
Laurent Destailleur
91700d84a6 Fix: lang file 2013-08-06 03:56:59 +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
218e9f5b33 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-08-05 18:55:38 +02:00
Laurent Destailleur
85572a4bd1 New: Start to work on box for product distributions 
Qual: Start to move code of dol_print_graph function into class
DolGraph.
 2013-08-05 17:19:49 +02:00
simnandez
283d9eb064 Text for invoices numbering modules more clear. Update ChangeLog 2013-08-02 15:27:37 +02:00
simnandez
6d1a021382 New: [ task #1005 ] Update mercure module with replacement invoices. 2013-08-02 12:11:14 +02:00
simnandez
d0bd188e74 New: [ task #1005 ] Improves and best adaptations 2013-08-02 10:44:14 +02:00
Laurent Destailleur
a35ee022f3 Merge pull request #1150 from atm-maxime/develop 
Task # 1016 : deposits numbering
 2013-08-01 13:06:46 -07:00
simnandez
d8fcec287b Fix: Reverse mars-es_ES to mars. It is not a numbering only for Spain. 2013-08-01 18:44:21 +02:00
Laurent Destailleur
4f464eb226 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/modules/export/export_excel2007.modules.php
	htdocs/langs/en_US/errors.lang
	htdocs/langs/fr_FR/agenda.lang
	htdocs/langs/fr_FR/errors.lang
 2013-08-01 17:42:18 +02:00
Laurent Destailleur
1fb8baa92e Fix: [ bug #1009 ] ZipArchive' not found 2013-08-01 16:56:17 +02:00
Maxime Kohlhaas
a6ef341ae7 Task # 1016 : can define a specific numbering for deposits 2013-08-01 16:30:31 +02:00
Laurent Destailleur
4786c90c4a Fix: Pb into export descriptions 2013-08-01 15:30:27 +02:00
Laurent Destailleur
bd33e8a962 Fix: Export of country 2013-08-01 15:28:19 +02:00
Laurent Destailleur
98bd56e229 Fix: Pb into export descriptions 2013-08-01 15:26:01 +02:00
Laurent Destailleur
e6022527dd Fix: Export of country 2013-08-01 12:49:46 +02:00
Florian Henry
325ceda4dc [ task #1014 ] Add option to recursivly add parent cactegory 2013-07-31 21:52:49 +02:00
Laurent Destailleur
e234d5342d Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/contrat/liste.php
 2013-07-31 12:45:39 +02:00
Florian Henry
21bdabc248 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-07-30 14:19:05 +02:00
Florian Henry
3bc7d3c877 Fix extrafeild thirdparty import and export 2013-07-30 14:18:56 +02:00
Laurent Destailleur
1c24f9e35e Merge pull request #1138 from atm-maxime/3.4 
Fix : Numbering on supplier invoice was not saved and on shipment displa...
 2013-07-30 03:22:29 -07:00
Maxime Kohlhaas
f9c2910f84 Fix : Numbering on supplier invoice was not saved and on shipment displayed error when ok 2013-07-30 09:21:45 +02:00
Florian Henry
d6f31d61bf Fix Typhon model $mysoc global is missing 2013-07-29 12:21:52 +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
daa10bcedd Fix: EOF 2013-07-27 12:32:04 +02:00
Laurent Destailleur
5608e320f7 New: Can add a suffix into filename of template after -. This may be 
used in future as specific criteria to filter list of numbering models
to show.
 2013-07-26 15:10:56 +02:00
Laurent Destailleur
8e3d86c7a5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
 2013-07-26 14:59:18 +02:00
simnandez
7efacecb08 New: [ task #1005 ] Adapting to Spanish legislation bill numbering 2013-07-26 12:46:34 +02:00
Maxime Kohlhaas
1199e61f4b CRLF issue 2013-07-26 12:33:58 +02:00
Laurent Destailleur
1e96452c6c New: Can show images of product onto proposals. 2013-07-26 12:24:30 +02:00
Laurent Destailleur
339118d6f4 Prepare for option MAIN_GENERATE_PROPOSALS_WITH_PICTURE 
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
 2013-07-24 20:20:31 +02:00
Laurent Destailleur
6b1b6b4fee Fix: Color no more lost 2013-07-24 20:20:10 +02:00
Laurent Destailleur
44682bd932 Merge pull request #1128 from defrance69/patch-9 
Update pdf_blochet.class.php
 2013-07-24 07:07:41 -07:00
Laurent Destailleur
2266b8b2a4 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
	htdocs/langs/ar_SA/bookmarks.lang
	htdocs/langs/ar_SA/boxes.lang
	htdocs/langs/ar_SA/cashdesk.lang
	htdocs/langs/ar_SA/categories.lang
	htdocs/langs/ar_SA/commercial.lang
	htdocs/langs/ar_SA/companies.lang
	htdocs/langs/ar_SA/compta.lang
	htdocs/langs/ar_SA/contracts.lang
	htdocs/langs/ar_SA/deliveries.lang
	htdocs/langs/ar_SA/dict.lang
	htdocs/langs/ar_SA/donations.lang
	htdocs/langs/ar_SA/ecm.lang
	htdocs/langs/ar_SA/errors.lang
	htdocs/langs/ar_SA/exports.lang
	htdocs/langs/ar_SA/externalsite.lang
	htdocs/langs/ar_SA/ftp.lang
	htdocs/langs/ar_SA/help.lang
	htdocs/langs/ar_SA/install.lang
	htdocs/langs/ar_SA/interventions.lang
	htdocs/langs/ar_SA/languages.lang
	htdocs/langs/ar_SA/ldap.lang
	htdocs/langs/ar_SA/mails.lang
	htdocs/langs/ar_SA/main.lang
	htdocs/langs/ar_SA/members.lang
	htdocs/langs/ar_SA/orders.lang
	htdocs/langs/ar_SA/oscommerce.lang
	htdocs/langs/ar_SA/paybox.lang
	htdocs/langs/ar_SA/paypal.lang
	htdocs/langs/ar_SA/projects.lang
	htdocs/langs/ar_SA/propal.lang
	htdocs/langs/ar_SA/sendings.lang
	htdocs/langs/ar_SA/shop.lang
	htdocs/langs/ar_SA/sms.lang
	htdocs/langs/ar_SA/stocks.lang
	htdocs/langs/ar_SA/suppliers.lang
	htdocs/langs/ar_SA/trips.lang
	htdocs/langs/ar_SA/users.lang
	htdocs/langs/ar_SA/withdrawals.lang
	htdocs/langs/ar_SA/workflow.lang
	htdocs/langs/bg_BG/admin.lang
	htdocs/langs/bg_BG/agenda.lang
	htdocs/langs/bg_BG/banks.lang
	htdocs/langs/bg_BG/bills.lang
	htdocs/langs/bg_BG/bookmarks.lang
	htdocs/langs/bg_BG/boxes.lang
	htdocs/langs/bg_BG/cashdesk.lang
	htdocs/langs/bg_BG/categories.lang
	htdocs/langs/bg_BG/commercial.lang
	htdocs/langs/bg_BG/companies.lang
	htdocs/langs/bg_BG/compta.lang
	htdocs/langs/bg_BG/contracts.lang
	htdocs/langs/bg_BG/deliveries.lang
	htdocs/langs/bg_BG/dict.lang
	htdocs/langs/bg_BG/donations.lang
	htdocs/langs/bg_BG/ecm.lang
	htdocs/langs/bg_BG/errors.lang
	htdocs/langs/bg_BG/exports.lang
	htdocs/langs/bg_BG/externalsite.lang
	htdocs/langs/bg_BG/ftp.lang
	htdocs/langs/bg_BG/help.lang
	htdocs/langs/bg_BG/holiday.lang
	htdocs/langs/bg_BG/install.lang
	htdocs/langs/bg_BG/interventions.lang
	htdocs/langs/bg_BG/languages.lang
	htdocs/langs/bg_BG/ldap.lang
	htdocs/langs/bg_BG/mailmanspip.lang
	htdocs/langs/bg_BG/mails.lang
	htdocs/langs/bg_BG/main.lang
	htdocs/langs/bg_BG/members.lang
	htdocs/langs/bg_BG/orders.lang
	htdocs/langs/bg_BG/oscommerce.lang
	htdocs/langs/bg_BG/other.lang
	htdocs/langs/bg_BG/paybox.lang
	htdocs/langs/bg_BG/paypal.lang
	htdocs/langs/bg_BG/products.lang
	htdocs/langs/bg_BG/projects.lang
	htdocs/langs/bg_BG/propal.lang
	htdocs/langs/bg_BG/sendings.lang
	htdocs/langs/bg_BG/shop.lang
	htdocs/langs/bg_BG/sms.lang
	htdocs/langs/bg_BG/stocks.lang
	htdocs/langs/bg_BG/suppliers.lang
	htdocs/langs/bg_BG/trips.lang
	htdocs/langs/bg_BG/users.lang
	htdocs/langs/bg_BG/withdrawals.lang
	htdocs/langs/bg_BG/workflow.lang
	htdocs/langs/ca_ES/paybox.lang
	htdocs/langs/da_DK/agenda.lang
	htdocs/langs/da_DK/banks.lang
	htdocs/langs/da_DK/bookmarks.lang
	htdocs/langs/da_DK/boxes.lang
	htdocs/langs/da_DK/cashdesk.lang
	htdocs/langs/da_DK/categories.lang
	htdocs/langs/da_DK/commercial.lang
	htdocs/langs/da_DK/companies.lang
	htdocs/langs/da_DK/compta.lang
	htdocs/langs/da_DK/contracts.lang
	htdocs/langs/da_DK/deliveries.lang
	htdocs/langs/da_DK/dict.lang
	htdocs/langs/da_DK/donations.lang
	htdocs/langs/da_DK/errors.lang
	htdocs/langs/da_DK/exports.lang
	htdocs/langs/da_DK/externalsite.lang
	htdocs/langs/da_DK/ftp.lang
	htdocs/langs/da_DK/install.lang
	htdocs/langs/da_DK/interventions.lang
	htdocs/langs/da_DK/languages.lang
	htdocs/langs/da_DK/mails.lang
	htdocs/langs/da_DK/members.lang
	htdocs/langs/da_DK/orders.lang
	htdocs/langs/da_DK/oscommerce.lang
	htdocs/langs/da_DK/paybox.lang
	htdocs/langs/da_DK/paypal.lang
	htdocs/langs/da_DK/projects.lang
	htdocs/langs/da_DK/propal.lang
	htdocs/langs/da_DK/sendings.lang
	htdocs/langs/da_DK/shop.lang
	htdocs/langs/da_DK/sms.lang
	htdocs/langs/da_DK/stocks.lang
	htdocs/langs/da_DK/suppliers.lang
	htdocs/langs/da_DK/trips.lang
	htdocs/langs/da_DK/users.lang
	htdocs/langs/da_DK/withdrawals.lang
	htdocs/langs/da_DK/workflow.lang
	htdocs/langs/de_DE/admin.lang
	htdocs/langs/de_DE/agenda.lang
	htdocs/langs/de_DE/banks.lang
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/de_DE/bookmarks.lang
	htdocs/langs/de_DE/boxes.lang
	htdocs/langs/de_DE/cashdesk.lang
	htdocs/langs/de_DE/categories.lang
	htdocs/langs/de_DE/commercial.lang
	htdocs/langs/de_DE/companies.lang
	htdocs/langs/de_DE/compta.lang
	htdocs/langs/de_DE/contracts.lang
	htdocs/langs/de_DE/deliveries.lang
	htdocs/langs/de_DE/dict.lang
	htdocs/langs/de_DE/donations.lang
	htdocs/langs/de_DE/ecm.lang
	htdocs/langs/de_DE/errors.lang
	htdocs/langs/de_DE/exports.lang
	htdocs/langs/de_DE/externalsite.lang
	htdocs/langs/de_DE/ftp.lang
	htdocs/langs/de_DE/help.lang
	htdocs/langs/de_DE/install.lang
	htdocs/langs/de_DE/interventions.lang
	htdocs/langs/de_DE/languages.lang
	htdocs/langs/de_DE/ldap.lang
	htdocs/langs/de_DE/mails.lang
	htdocs/langs/de_DE/main.lang
	htdocs/langs/de_DE/members.lang
	htdocs/langs/de_DE/orders.lang
	htdocs/langs/de_DE/oscommerce.lang
	htdocs/langs/de_DE/other.lang
	htdocs/langs/de_DE/paybox.lang
	htdocs/langs/de_DE/paypal.lang
	htdocs/langs/de_DE/products.lang
	htdocs/langs/de_DE/projects.lang
	htdocs/langs/de_DE/propal.lang
	htdocs/langs/de_DE/sendings.lang
	htdocs/langs/de_DE/shop.lang
	htdocs/langs/de_DE/sms.lang
	htdocs/langs/de_DE/stocks.lang
	htdocs/langs/de_DE/suppliers.lang
	htdocs/langs/de_DE/trips.lang
	htdocs/langs/de_DE/users.lang
	htdocs/langs/de_DE/withdrawals.lang
	htdocs/langs/de_DE/workflow.lang
	htdocs/langs/el_GR/agenda.lang
	htdocs/langs/el_GR/banks.lang
	htdocs/langs/el_GR/bookmarks.lang
	htdocs/langs/el_GR/boxes.lang
	htdocs/langs/el_GR/cashdesk.lang
	htdocs/langs/el_GR/commercial.lang
	htdocs/langs/el_GR/companies.lang
	htdocs/langs/el_GR/compta.lang
	htdocs/langs/el_GR/contracts.lang
	htdocs/langs/el_GR/deliveries.lang
	htdocs/langs/el_GR/dict.lang
	htdocs/langs/el_GR/donations.lang
	htdocs/langs/el_GR/errors.lang
	htdocs/langs/el_GR/externalsite.lang
	htdocs/langs/el_GR/ftp.lang
	htdocs/langs/el_GR/help.lang
	htdocs/langs/el_GR/install.lang
	htdocs/langs/el_GR/interventions.lang
	htdocs/langs/el_GR/languages.lang
	htdocs/langs/el_GR/ldap.lang
	htdocs/langs/el_GR/mails.lang
	htdocs/langs/el_GR/main.lang
	htdocs/langs/el_GR/orders.lang
	htdocs/langs/el_GR/paybox.lang
	htdocs/langs/el_GR/paypal.lang
	htdocs/langs/el_GR/projects.lang
	htdocs/langs/el_GR/propal.lang
	htdocs/langs/el_GR/sendings.lang
	htdocs/langs/el_GR/shop.lang
	htdocs/langs/el_GR/sms.lang
	htdocs/langs/el_GR/stocks.lang
	htdocs/langs/el_GR/suppliers.lang
	htdocs/langs/el_GR/trips.lang
	htdocs/langs/el_GR/users.lang
	htdocs/langs/el_GR/withdrawals.lang
	htdocs/langs/el_GR/workflow.lang
	htdocs/langs/en_US/bookmarks.lang
	htdocs/langs/en_US/ftp.lang
	htdocs/langs/en_US/other.lang
	htdocs/langs/en_US/paypal.lang
	htdocs/langs/et_EE/admin.lang
	htdocs/langs/et_EE/agenda.lang
	htdocs/langs/et_EE/banks.lang
	htdocs/langs/et_EE/bills.lang
	htdocs/langs/et_EE/bookmarks.lang
	htdocs/langs/et_EE/boxes.lang
	htdocs/langs/et_EE/cashdesk.lang
	htdocs/langs/et_EE/categories.lang
	htdocs/langs/et_EE/commercial.lang
	htdocs/langs/et_EE/companies.lang
	htdocs/langs/et_EE/compta.lang
	htdocs/langs/et_EE/contracts.lang
	htdocs/langs/et_EE/deliveries.lang
	htdocs/langs/et_EE/dict.lang
	htdocs/langs/et_EE/donations.lang
	htdocs/langs/et_EE/ecm.lang
	htdocs/langs/et_EE/errors.lang
	htdocs/langs/et_EE/exports.lang
	htdocs/langs/et_EE/externalsite.lang
	htdocs/langs/et_EE/ftp.lang
	htdocs/langs/et_EE/help.lang
	htdocs/langs/et_EE/install.lang
	htdocs/langs/et_EE/interventions.lang
	htdocs/langs/et_EE/languages.lang
	htdocs/langs/et_EE/ldap.lang
	htdocs/langs/et_EE/mails.lang
	htdocs/langs/et_EE/main.lang
	htdocs/langs/et_EE/members.lang
	htdocs/langs/et_EE/orders.lang
	htdocs/langs/et_EE/oscommerce.lang
	htdocs/langs/et_EE/other.lang
	htdocs/langs/et_EE/paybox.lang
	htdocs/langs/et_EE/paypal.lang
	htdocs/langs/et_EE/products.lang
	htdocs/langs/et_EE/projects.lang
	htdocs/langs/et_EE/propal.lang
	htdocs/langs/et_EE/sendings.lang
	htdocs/langs/et_EE/shop.lang
	htdocs/langs/et_EE/sms.lang
	htdocs/langs/et_EE/stocks.lang
	htdocs/langs/et_EE/suppliers.lang
	htdocs/langs/et_EE/trips.lang
	htdocs/langs/et_EE/users.lang
	htdocs/langs/et_EE/withdrawals.lang
	htdocs/langs/et_EE/workflow.lang
	htdocs/langs/fa_IR/agenda.lang
	htdocs/langs/fa_IR/banks.lang
	htdocs/langs/fa_IR/bookmarks.lang
	htdocs/langs/fa_IR/boxes.lang
	htdocs/langs/fa_IR/categories.lang
	htdocs/langs/fa_IR/commercial.lang
	htdocs/langs/fa_IR/companies.lang
	htdocs/langs/fa_IR/compta.lang
	htdocs/langs/fa_IR/contracts.lang
	htdocs/langs/fa_IR/deliveries.lang
	htdocs/langs/fa_IR/dict.lang
	htdocs/langs/fa_IR/donations.lang
	htdocs/langs/fa_IR/ecm.lang
	htdocs/langs/fa_IR/errors.lang
	htdocs/langs/fa_IR/exports.lang
	htdocs/langs/fa_IR/ftp.lang
	htdocs/langs/fa_IR/help.lang
	htdocs/langs/fa_IR/install.lang
	htdocs/langs/fa_IR/interventions.lang
	htdocs/langs/fa_IR/languages.lang
	htdocs/langs/fa_IR/ldap.lang
	htdocs/langs/fa_IR/mails.lang
	htdocs/langs/fa_IR/main.lang
	htdocs/langs/fa_IR/members.lang
	htdocs/langs/fa_IR/orders.lang
	htdocs/langs/fa_IR/oscommerce.lang
	htdocs/langs/fa_IR/paybox.lang
	htdocs/langs/fa_IR/paypal.lang
	htdocs/langs/fa_IR/projects.lang
	htdocs/langs/fa_IR/propal.lang
	htdocs/langs/fa_IR/shop.lang
	htdocs/langs/fa_IR/stocks.lang
	htdocs/langs/fa_IR/suppliers.lang
	htdocs/langs/fa_IR/trips.lang
	htdocs/langs/fa_IR/users.lang
	htdocs/langs/fa_IR/withdrawals.lang
	htdocs/langs/fi_FI/agenda.lang
	htdocs/langs/fi_FI/banks.lang
	htdocs/langs/fi_FI/bookmarks.lang
	htdocs/langs/fi_FI/boxes.lang
	htdocs/langs/fi_FI/cashdesk.lang
	htdocs/langs/fi_FI/categories.lang
	htdocs/langs/fi_FI/commercial.lang
	htdocs/langs/fi_FI/companies.lang
	htdocs/langs/fi_FI/compta.lang
	htdocs/langs/fi_FI/contracts.lang
	htdocs/langs/fi_FI/deliveries.lang
	htdocs/langs/fi_FI/dict.lang
	htdocs/langs/fi_FI/donations.lang
	htdocs/langs/fi_FI/errors.lang
	htdocs/langs/fi_FI/exports.lang
	htdocs/langs/fi_FI/externalsite.lang
	htdocs/langs/fi_FI/ftp.lang
	htdocs/langs/fi_FI/install.lang
	htdocs/langs/fi_FI/interventions.lang
	htdocs/langs/fi_FI/languages.lang
	htdocs/langs/fi_FI/mails.lang
	htdocs/langs/fi_FI/members.lang
	htdocs/langs/fi_FI/orders.lang
	htdocs/langs/fi_FI/paybox.lang
	htdocs/langs/fi_FI/paypal.lang
	htdocs/langs/fi_FI/projects.lang
	htdocs/langs/fi_FI/propal.lang
	htdocs/langs/fi_FI/sendings.lang
	htdocs/langs/fi_FI/sms.lang
	htdocs/langs/fi_FI/stocks.lang
	htdocs/langs/fi_FI/suppliers.lang
	htdocs/langs/fi_FI/trips.lang
	htdocs/langs/fi_FI/users.lang
	htdocs/langs/fi_FI/withdrawals.lang
	htdocs/langs/fi_FI/workflow.lang
	htdocs/langs/fr_FR/bookmarks.lang
	htdocs/langs/fr_FR/externalsite.lang
	htdocs/langs/fr_FR/other.lang
	htdocs/langs/fr_FR/paybox.lang
	htdocs/langs/fr_FR/paypal.lang
	htdocs/langs/he_IL/workflow.lang
	htdocs/langs/hu_HU/admin.lang
	htdocs/langs/hu_HU/agenda.lang
	htdocs/langs/hu_HU/banks.lang
	htdocs/langs/hu_HU/bills.lang
	htdocs/langs/hu_HU/boxes.lang
	htdocs/langs/hu_HU/cashdesk.lang
	htdocs/langs/hu_HU/commercial.lang
	htdocs/langs/hu_HU/companies.lang
	htdocs/langs/hu_HU/compta.lang
	htdocs/langs/hu_HU/contracts.lang
	htdocs/langs/hu_HU/deliveries.lang
	htdocs/langs/hu_HU/dict.lang
	htdocs/langs/hu_HU/donations.lang
	htdocs/langs/hu_HU/errors.lang
	htdocs/langs/hu_HU/exports.lang
	htdocs/langs/hu_HU/externalsite.lang
	htdocs/langs/hu_HU/install.lang
	htdocs/langs/hu_HU/interventions.lang
	htdocs/langs/hu_HU/languages.lang
	htdocs/langs/hu_HU/mails.lang
	htdocs/langs/hu_HU/main.lang
	htdocs/langs/hu_HU/members.lang
	htdocs/langs/hu_HU/orders.lang
	htdocs/langs/hu_HU/oscommerce.lang
	htdocs/langs/hu_HU/other.lang
	htdocs/langs/hu_HU/paybox.lang
	htdocs/langs/hu_HU/paypal.lang
	htdocs/langs/hu_HU/projects.lang
	htdocs/langs/hu_HU/propal.lang
	htdocs/langs/hu_HU/sendings.lang
	htdocs/langs/hu_HU/sms.lang
	htdocs/langs/hu_HU/stocks.lang
	htdocs/langs/hu_HU/suppliers.lang
	htdocs/langs/hu_HU/trips.lang
	htdocs/langs/hu_HU/users.lang
	htdocs/langs/hu_HU/withdrawals.lang
	htdocs/langs/hu_HU/workflow.lang
	htdocs/langs/is_IS/agenda.lang
	htdocs/langs/is_IS/banks.lang
	htdocs/langs/is_IS/bookmarks.lang
	htdocs/langs/is_IS/boxes.lang
	htdocs/langs/is_IS/cashdesk.lang
	htdocs/langs/is_IS/categories.lang
	htdocs/langs/is_IS/commercial.lang
	htdocs/langs/is_IS/companies.lang
	htdocs/langs/is_IS/compta.lang
	htdocs/langs/is_IS/contracts.lang
	htdocs/langs/is_IS/deliveries.lang
	htdocs/langs/is_IS/dict.lang
	htdocs/langs/is_IS/donations.lang
	htdocs/langs/is_IS/ecm.lang
	htdocs/langs/is_IS/errors.lang
	htdocs/langs/is_IS/exports.lang
	htdocs/langs/is_IS/externalsite.lang
	htdocs/langs/is_IS/ftp.lang
	htdocs/langs/is_IS/help.lang
	htdocs/langs/is_IS/install.lang
	htdocs/langs/is_IS/interventions.lang
	htdocs/langs/is_IS/languages.lang
	htdocs/langs/is_IS/ldap.lang
	htdocs/langs/is_IS/mails.lang
	htdocs/langs/is_IS/main.lang
	htdocs/langs/is_IS/members.lang
	htdocs/langs/is_IS/orders.lang
	htdocs/langs/is_IS/oscommerce.lang
	htdocs/langs/is_IS/paybox.lang
	htdocs/langs/is_IS/paypal.lang
	htdocs/langs/is_IS/products.lang
	htdocs/langs/is_IS/projects.lang
	htdocs/langs/is_IS/propal.lang
	htdocs/langs/is_IS/sendings.lang
	htdocs/langs/is_IS/shop.lang
	htdocs/langs/is_IS/sms.lang
	htdocs/langs/is_IS/stocks.lang
	htdocs/langs/is_IS/suppliers.lang
	htdocs/langs/is_IS/trips.lang
	htdocs/langs/is_IS/users.lang
	htdocs/langs/is_IS/withdrawals.lang
	htdocs/langs/is_IS/workflow.lang
	htdocs/langs/it_IT/bookmarks.lang
	htdocs/langs/it_IT/cashdesk.lang
	htdocs/langs/it_IT/errors.lang
	htdocs/langs/it_IT/exports.lang
	htdocs/langs/it_IT/externalsite.lang
	htdocs/langs/it_IT/languages.lang
	htdocs/langs/it_IT/paybox.lang
	htdocs/langs/it_IT/paypal.lang
	htdocs/langs/it_IT/projects.lang
	htdocs/langs/it_IT/propal.lang
	htdocs/langs/it_IT/sendings.lang
	htdocs/langs/it_IT/sms.lang
	htdocs/langs/it_IT/workflow.lang
	htdocs/langs/ja_JP/admin.lang
	htdocs/langs/ja_JP/agenda.lang
	htdocs/langs/ja_JP/banks.lang
	htdocs/langs/ja_JP/bills.lang
	htdocs/langs/ja_JP/bookmarks.lang
	htdocs/langs/ja_JP/boxes.lang
	htdocs/langs/ja_JP/cashdesk.lang
	htdocs/langs/ja_JP/categories.lang
	htdocs/langs/ja_JP/commercial.lang
	htdocs/langs/ja_JP/companies.lang
	htdocs/langs/ja_JP/compta.lang
	htdocs/langs/ja_JP/contracts.lang
	htdocs/langs/ja_JP/deliveries.lang
	htdocs/langs/ja_JP/dict.lang
	htdocs/langs/ja_JP/donations.lang
	htdocs/langs/ja_JP/ecm.lang
	htdocs/langs/ja_JP/errors.lang
	htdocs/langs/ja_JP/exports.lang
	htdocs/langs/ja_JP/externalsite.lang
	htdocs/langs/ja_JP/ftp.lang
	htdocs/langs/ja_JP/help.lang
	htdocs/langs/ja_JP/install.lang
	htdocs/langs/ja_JP/interventions.lang
	htdocs/langs/ja_JP/languages.lang
	htdocs/langs/ja_JP/ldap.lang
	htdocs/langs/ja_JP/mails.lang
	htdocs/langs/ja_JP/main.lang
	htdocs/langs/ja_JP/members.lang
	htdocs/langs/ja_JP/orders.lang
	htdocs/langs/ja_JP/oscommerce.lang
	htdocs/langs/ja_JP/other.lang
	htdocs/langs/ja_JP/paybox.lang
	htdocs/langs/ja_JP/paypal.lang
	htdocs/langs/ja_JP/products.lang
	htdocs/langs/ja_JP/projects.lang
	htdocs/langs/ja_JP/propal.lang
	htdocs/langs/ja_JP/sendings.lang
	htdocs/langs/ja_JP/shop.lang
	htdocs/langs/ja_JP/sms.lang
	htdocs/langs/ja_JP/stocks.lang
	htdocs/langs/ja_JP/suppliers.lang
	htdocs/langs/ja_JP/trips.lang
	htdocs/langs/ja_JP/users.lang
	htdocs/langs/ja_JP/withdrawals.lang
	htdocs/langs/ja_JP/workflow.lang
	htdocs/langs/nb_NO/agenda.lang
	htdocs/langs/nb_NO/banks.lang
	htdocs/langs/nb_NO/bookmarks.lang
	htdocs/langs/nb_NO/boxes.lang
	htdocs/langs/nb_NO/cashdesk.lang
	htdocs/langs/nb_NO/categories.lang
	htdocs/langs/nb_NO/commercial.lang
	htdocs/langs/nb_NO/companies.lang
	htdocs/langs/nb_NO/compta.lang
	htdocs/langs/nb_NO/contracts.lang
	htdocs/langs/nb_NO/deliveries.lang
	htdocs/langs/nb_NO/dict.lang
	htdocs/langs/nb_NO/donations.lang
	htdocs/langs/nb_NO/errors.lang
	htdocs/langs/nb_NO/exports.lang
	htdocs/langs/nb_NO/externalsite.lang
	htdocs/langs/nb_NO/ftp.lang
	htdocs/langs/nb_NO/help.lang
	htdocs/langs/nb_NO/install.lang
	htdocs/langs/nb_NO/interventions.lang
	htdocs/langs/nb_NO/languages.lang
	htdocs/langs/nb_NO/ldap.lang
	htdocs/langs/nb_NO/mails.lang
	htdocs/langs/nb_NO/main.lang
	htdocs/langs/nb_NO/members.lang
	htdocs/langs/nb_NO/orders.lang
	htdocs/langs/nb_NO/paybox.lang
	htdocs/langs/nb_NO/paypal.lang
	htdocs/langs/nb_NO/projects.lang
	htdocs/langs/nb_NO/propal.lang
	htdocs/langs/nb_NO/sendings.lang
	htdocs/langs/nb_NO/sms.lang
	htdocs/langs/nb_NO/stocks.lang
	htdocs/langs/nb_NO/suppliers.lang
	htdocs/langs/nb_NO/trips.lang
	htdocs/langs/nb_NO/users.lang
	htdocs/langs/nb_NO/withdrawals.lang
	htdocs/langs/nb_NO/workflow.lang
	htdocs/langs/nl_NL/propal.lang
	htdocs/langs/nl_NL/workflow.lang
	htdocs/langs/pl_PL/agenda.lang
	htdocs/langs/pl_PL/banks.lang
	htdocs/langs/pl_PL/bookmarks.lang
	htdocs/langs/pl_PL/boxes.lang
	htdocs/langs/pl_PL/cashdesk.lang
	htdocs/langs/pl_PL/categories.lang
	htdocs/langs/pl_PL/commercial.lang
	htdocs/langs/pl_PL/companies.lang
	htdocs/langs/pl_PL/compta.lang
	htdocs/langs/pl_PL/contracts.lang
	htdocs/langs/pl_PL/deliveries.lang
	htdocs/langs/pl_PL/dict.lang
	htdocs/langs/pl_PL/donations.lang
	htdocs/langs/pl_PL/errors.lang
	htdocs/langs/pl_PL/exports.lang
	htdocs/langs/pl_PL/externalsite.lang
	htdocs/langs/pl_PL/ftp.lang
	htdocs/langs/pl_PL/install.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pl_PL/languages.lang
	htdocs/langs/pl_PL/mails.lang
	htdocs/langs/pl_PL/members.lang
	htdocs/langs/pl_PL/orders.lang
	htdocs/langs/pl_PL/other.lang
	htdocs/langs/pl_PL/paybox.lang
	htdocs/langs/pl_PL/paypal.lang
	htdocs/langs/pl_PL/projects.lang
	htdocs/langs/pl_PL/propal.lang
	htdocs/langs/pl_PL/sendings.lang
	htdocs/langs/pl_PL/sms.lang
	htdocs/langs/pl_PL/stocks.lang
	htdocs/langs/pl_PL/suppliers.lang
	htdocs/langs/pl_PL/trips.lang
	htdocs/langs/pl_PL/users.lang
	htdocs/langs/pl_PL/withdrawals.lang
	htdocs/langs/pl_PL/workflow.lang
	htdocs/langs/pt_PT/cashdesk.lang
	htdocs/langs/ro_RO/agenda.lang
	htdocs/langs/ro_RO/banks.lang
	htdocs/langs/ro_RO/bookmarks.lang
	htdocs/langs/ro_RO/boxes.lang
	htdocs/langs/ro_RO/cashdesk.lang
	htdocs/langs/ro_RO/commercial.lang
	htdocs/langs/ro_RO/companies.lang
	htdocs/langs/ro_RO/compta.lang
	htdocs/langs/ro_RO/contracts.lang
	htdocs/langs/ro_RO/deliveries.lang
	htdocs/langs/ro_RO/dict.lang
	htdocs/langs/ro_RO/donations.lang
	htdocs/langs/ro_RO/errors.lang
	htdocs/langs/ro_RO/exports.lang
	htdocs/langs/ro_RO/externalsite.lang
	htdocs/langs/ro_RO/interventions.lang
	htdocs/langs/ro_RO/languages.lang
	htdocs/langs/ro_RO/mails.lang
	htdocs/langs/ro_RO/main.lang
	htdocs/langs/ro_RO/members.lang
	htdocs/langs/ro_RO/orders.lang
	htdocs/langs/ro_RO/other.lang
	htdocs/langs/ro_RO/paybox.lang
	htdocs/langs/ro_RO/paypal.lang
	htdocs/langs/ro_RO/projects.lang
	htdocs/langs/ro_RO/propal.lang
	htdocs/langs/ro_RO/sendings.lang
	htdocs/langs/ro_RO/sms.lang
	htdocs/langs/ro_RO/stocks.lang
	htdocs/langs/ro_RO/suppliers.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/langs/ro_RO/users.lang
	htdocs/langs/ro_RO/withdrawals.lang
	htdocs/langs/ro_RO/workflow.lang
	htdocs/langs/ru_RU/agenda.lang
	htdocs/langs/ru_RU/bills.lang
	htdocs/langs/ru_RU/bookmarks.lang
	htdocs/langs/ru_RU/boxes.lang
	htdocs/langs/ru_RU/companies.lang
	htdocs/langs/ru_RU/compta.lang
	htdocs/langs/ru_RU/contracts.lang
	htdocs/langs/ru_RU/errors.lang
	htdocs/langs/ru_RU/exports.lang
	htdocs/langs/ru_RU/externalsite.lang
	htdocs/langs/ru_RU/install.lang
	htdocs/langs/ru_RU/mails.lang
	htdocs/langs/ru_RU/main.lang
	htdocs/langs/ru_RU/members.lang
	htdocs/langs/ru_RU/orders.lang
	htdocs/langs/ru_RU/paybox.lang
	htdocs/langs/ru_RU/paypal.lang
	htdocs/langs/ru_RU/propal.lang
	htdocs/langs/ru_RU/stocks.lang
	htdocs/langs/ru_UA/main.lang
	htdocs/langs/sl_SI/agenda.lang
	htdocs/langs/sl_SI/boxes.lang
	htdocs/langs/sl_SI/cashdesk.lang
	htdocs/langs/sl_SI/companies.lang
	htdocs/langs/sl_SI/compta.lang
	htdocs/langs/sl_SI/contracts.lang
	htdocs/langs/sl_SI/dict.lang
	htdocs/langs/sl_SI/errors.lang
	htdocs/langs/sl_SI/exports.lang
	htdocs/langs/sl_SI/externalsite.lang
	htdocs/langs/sl_SI/install.lang
	htdocs/langs/sl_SI/languages.lang
	htdocs/langs/sl_SI/mails.lang
	htdocs/langs/sl_SI/main.lang
	htdocs/langs/sl_SI/members.lang
	htdocs/langs/sl_SI/orders.lang
	htdocs/langs/sl_SI/paybox.lang
	htdocs/langs/sl_SI/paypal.lang
	htdocs/langs/sl_SI/propal.lang
	htdocs/langs/sl_SI/sendings.lang
	htdocs/langs/sl_SI/stocks.lang
	htdocs/langs/sl_SI/suppliers.lang
	htdocs/langs/sv_SE/admin.lang
	htdocs/langs/sv_SE/agenda.lang
	htdocs/langs/sv_SE/banks.lang
	htdocs/langs/sv_SE/bookmarks.lang
	htdocs/langs/sv_SE/boxes.lang
	htdocs/langs/sv_SE/cashdesk.lang
	htdocs/langs/sv_SE/categories.lang
	htdocs/langs/sv_SE/commercial.lang
	htdocs/langs/sv_SE/companies.lang
	htdocs/langs/sv_SE/compta.lang
	htdocs/langs/sv_SE/contracts.lang
	htdocs/langs/sv_SE/deliveries.lang
	htdocs/langs/sv_SE/dict.lang
	htdocs/langs/sv_SE/donations.lang
	htdocs/langs/sv_SE/ecm.lang
	htdocs/langs/sv_SE/errors.lang
	htdocs/langs/sv_SE/exports.lang
	htdocs/langs/sv_SE/externalsite.lang
	htdocs/langs/sv_SE/ftp.lang
	htdocs/langs/sv_SE/help.lang
	htdocs/langs/sv_SE/install.lang
	htdocs/langs/sv_SE/interventions.lang
	htdocs/langs/sv_SE/languages.lang
	htdocs/langs/sv_SE/ldap.lang
	htdocs/langs/sv_SE/mails.lang
	htdocs/langs/sv_SE/main.lang
	htdocs/langs/sv_SE/members.lang
	htdocs/langs/sv_SE/orders.lang
	htdocs/langs/sv_SE/oscommerce.lang
	htdocs/langs/sv_SE/other.lang
	htdocs/langs/sv_SE/paybox.lang
	htdocs/langs/sv_SE/paypal.lang
	htdocs/langs/sv_SE/products.lang
	htdocs/langs/sv_SE/projects.lang
	htdocs/langs/sv_SE/propal.lang
	htdocs/langs/sv_SE/sendings.lang
	htdocs/langs/sv_SE/shop.lang
	htdocs/langs/sv_SE/sms.lang
	htdocs/langs/sv_SE/stocks.lang
	htdocs/langs/sv_SE/suppliers.lang
	htdocs/langs/sv_SE/trips.lang
	htdocs/langs/sv_SE/users.lang
	htdocs/langs/sv_SE/withdrawals.lang
	htdocs/langs/sv_SE/workflow.lang
	htdocs/langs/tr_TR/donations.lang
	htdocs/langs/tr_TR/ldap.lang
	htdocs/langs/tr_TR/oscommerce.lang
	htdocs/langs/tr_TR/paybox.lang
	htdocs/langs/tr_TR/paypal.lang
	htdocs/langs/tr_TR/shop.lang
	htdocs/langs/tr_TR/trips.lang
	htdocs/langs/zh_CN/agenda.lang
	htdocs/langs/zh_CN/banks.lang
	htdocs/langs/zh_CN/bookmarks.lang
	htdocs/langs/zh_CN/boxes.lang
	htdocs/langs/zh_CN/cashdesk.lang
	htdocs/langs/zh_CN/commercial.lang
	htdocs/langs/zh_CN/companies.lang
	htdocs/langs/zh_CN/compta.lang
	htdocs/langs/zh_CN/contracts.lang
	htdocs/langs/zh_CN/deliveries.lang
	htdocs/langs/zh_CN/dict.lang
	htdocs/langs/zh_CN/donations.lang
	htdocs/langs/zh_CN/ecm.lang
	htdocs/langs/zh_CN/errors.lang
	htdocs/langs/zh_CN/exports.lang
	htdocs/langs/zh_CN/externalsite.lang
	htdocs/langs/zh_CN/ftp.lang
	htdocs/langs/zh_CN/install.lang
	htdocs/langs/zh_CN/interventions.lang
	htdocs/langs/zh_CN/languages.lang
	htdocs/langs/zh_CN/mails.lang
	htdocs/langs/zh_CN/main.lang
	htdocs/langs/zh_CN/members.lang
	htdocs/langs/zh_CN/orders.lang
	htdocs/langs/zh_CN/oscommerce.lang
	htdocs/langs/zh_CN/paybox.lang
	htdocs/langs/zh_CN/paypal.lang
	htdocs/langs/zh_CN/projects.lang
	htdocs/langs/zh_CN/propal.lang
	htdocs/langs/zh_CN/sendings.lang
	htdocs/langs/zh_CN/shop.lang
	htdocs/langs/zh_CN/sms.lang
	htdocs/langs/zh_CN/stocks.lang
	htdocs/langs/zh_CN/suppliers.lang
	htdocs/langs/zh_CN/trips.lang
	htdocs/langs/zh_CN/users.lang
	htdocs/langs/zh_CN/withdrawals.lang
	htdocs/langs/zh_CN/workflow.lang
	htdocs/langs/zh_TW/banks.lang
	htdocs/langs/zh_TW/bookmarks.lang
	htdocs/langs/zh_TW/boxes.lang
	htdocs/langs/zh_TW/cashdesk.lang
	htdocs/langs/zh_TW/deliveries.lang
	htdocs/langs/zh_TW/ecm.lang
	htdocs/langs/zh_TW/externalsite.lang
	htdocs/langs/zh_TW/oscommerce.lang
	htdocs/langs/zh_TW/paypal.lang
	htdocs/langs/zh_TW/shop.lang
	htdocs/langs/zh_TW/sms.lang
	htdocs/langs/zh_TW/trips.lang
	htdocs/langs/zh_TW/withdrawals.lang
	htdocs/langs/zh_TW/workflow.lang
	scripts/invoices/email_unpaid_invoices_to_customers.php
	scripts/members/sync_members_ldap2dolibarr.php
 2013-07-24 15:51:50 +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
Florian Henry
0ce833d282 Fix bug export contact extrafields 2013-07-24 15:19:05 +02:00
Laurent Destailleur
7cf429d238 Fix: Color change on page break. 2013-07-24 15:04:09 +02:00
Florian Henry
f11d477770 Fix bug export contact extrafields 2013-07-24 13:28:02 +02:00
BENKE Charles
34c09c3aa5 Update pdf_blochet.class.php 
add ref_ext on pdf output if not empty
 2013-07-24 11:14:38 +02:00
Laurent Destailleur
126c72ca24 Merge pull request #1127 from csalvador/taskpdffix 
fix pdf model import
 2013-07-24 01:30:55 -07:00
Cédric Salvador
35faff04e9 fix pdf model import 2013-07-23 15:59:41 +02:00
BENKE Charles
8c7c3f03d3 Update modBanque.class.php 
Add bordereau ref_ext fields on export
 2013-07-23 05:54:47 +02:00
Juanjo Menent
d7da816258 Merge pull request #1114 from defrance69/patch-5 
Update modBanque.class.php
 2013-07-22 00:05:46 -07:00
BENKE Charles
c555c17315 Update modBanque.class.php 
Add Export of check deposit / bill
 2013-07-20 23:47:37 +02:00
Geoffrey
27e26c872e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 
Conflicts:
	ChangeLog
 2013-07-19 17:33:29 +02:00
Maxime Kohlhaas
7c24686532 Add good vars for odt generation 2013-07-19 17:27:22 +02:00
Laurent Destailleur
486920958c Fix: Restore error message, but only when required. 2013-07-19 17:19:35 +02:00
Laurent Destailleur
c7aadfcf65 Fix: syntax error 2013-07-19 17:18:44 +02:00
Raphaël Doursenaud
e119a5c650 Avoid printing errors on documents that are fine without 2013-07-19 15:08:30 +02:00
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
Laurent Destailleur
22f57e3350 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-07-18 19:02:02 +02:00
Laurent Destailleur
75214a6b70 New: Add graphical box for turnover and proposal 2013-07-18 16:53:31 +02:00
Florian Henry
9d942017ee Merge remote-tracking branch 'origin/develop' into develop_T165 2013-07-18 10:56:57 +02:00
Florian Henry
d5731dd310 [ task #165 ] Add export of multiprices 2013-07-18 10:47:08 +02:00
Florian Henry
0c0a64f532 [ task #924 ] Add numbering rule on task 
[ task #925 ] Add ODT document generation for Tasks in project module
 2013-07-18 10:24:45 +02:00
Florian Henry
ee82330292 On going sync/merge from other repo 2013-07-17 19:17:54 +02:00
Florian Henry
2476e7bcaf Start functionnality 2013-07-17 18:45:58 +02:00
Laurent Destailleur
7b97214df5 Merge pull request #1096 from FHenry/develop_categorycontact 
Develop categorycontact
 2013-07-17 08:41:02 -07:00
Florian Henry
4fee61beb0 Fix adding email into mailing module 
source_id is already added
 2013-07-16 21:34:24 +02:00
Florian Henry
e07eac9b17 [ task #519 ] Add category association with contacts 2013-07-16 21:04:58 +02:00
Laurent Destailleur
f564d1912e New: Add graph for supplier invoices. 
Fix: Error management into supplier invoice validation.
 2013-07-16 18:43:38 +02:00
Laurent Destailleur
dd10ff8a11 eol 2013-07-15 18:51:56 +02:00
Laurent Destailleur
9c9b81c981 Merge pull request #1092 from atm-maxime/mko862 
Task 862 : ODT on shipment
 2013-07-14 10:21:10 -07:00
Laurent Destailleur
001072d34c Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE 2013-07-14 18:43:58 +02:00
Laurent Destailleur
6a1446f4dd Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE 2013-07-14 16:35:02 +02:00
Maxime Kohlhaas
9e5286bce9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2013-07-14 13:27:41 +02:00
Laurent Destailleur
3a9ffb19c3 fix: eol 2013-07-13 21:14:05 +02:00
Maxime Kohlhaas
3c7f4a3548 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862 
Conflicts:
	htdocs/admin/system/perf.php
 2013-07-11 15:55:33 +02:00
Laurent Destailleur
807cbe4163 Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE 2013-07-11 09:43:07 +02:00
Maxime Kohlhaas
9d931b7b05 Task # 862 : ODT templates on shipment 2013-07-10 15:54:28 +02:00
BENKE Charles
45e32ca3a5 Update modFacture.class.php 
add 'accountancy_code_sell' to the customer invoice export list
 2013-07-05 12:14:27 +02:00
Raphaël Doursenaud
b9ff5188b3 Normalized EOL 2013-07-01 12:00:42 +02:00
Laurent Destailleur
134187ef94 Fix: Overlapping of company name. 
Fix: Missing state for ome countries.
 2013-07-01 00:08:44 +02:00
Laurent Destailleur
10e28fa27a Fix: Overlapping of company name. 
Fix: Missing state for ome countries.
 2013-07-01 00:05:39 +02:00
Laurent Destailleur
387c213aea New: Add box for graph of customer orders 2013-06-30 23:01:28 +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
dc22b5a50a Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/modules/mailings/modules_mailings.php
 2013-06-28 00:24:13 +02:00
Florian Henry
469e700895 Fix bug pgsql : add mail directly into mailling 2013-06-27 14:35:41 +02:00
jfefe
b513bd7b84 Fix : bad element type name for company extrafields into export 2013-06-27 14:30:49 +02:00
Laurent Destailleur
696ad07871 LF 2013-06-26 16:45:42 +02:00
Laurent Destailleur
af4651f1a2 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/perl/virtualmin/dolibarr.pl
	htdocs/core/lib/files.lib.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/webservices/server_other.php
 2013-06-25 23:22:00 +02:00
Laurent Destailleur
285ea8da3f More info into log 2013-06-25 15:47:59 +02:00
Laurent Destailleur
a8547b5375 New: Add property hidden into module descriptor to allow to hide a 
module according to some dynamic conditions.
 2013-06-24 18:31:56 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Laurent Destailleur
ec2e3db450 New: Switch cron module to status stable. Thanks to everybody to test 
this new module and debug it.
 2013-06-23 22:21:21 +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
3cd303c944 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2013-06-14 19:56:07 +02:00
Laurent Destailleur
3b88142ba8 Fix: Import of extra field for members 2013-06-14 02:41:08 +02:00
Laurent Destailleur
13b3a3c850 Fix: Export of extra field for members 2013-06-14 02:35:30 +02:00
Laurent Destailleur
b3ca9de399 Fix: Update select with list 2013-06-14 02:09:34 +02:00
Laurent Destailleur
a50cd7b698 Fix bug into script that fix CRLF into LF 2013-06-12 11:59:55 +02:00
Laurent Destailleur
0b35217481 Start to debug/fix module IPP 2013-06-12 11:35:30 +02:00
Laurent Destailleur
0c9bc2ac5f Merge branch 'develop' of https://github.com/frederic34/dolibarr into 
frederic34-develop

Conflicts:
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
 2013-06-12 10:47:56 +02:00
Laurent Destailleur
51d11ff190 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/facture/stats/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/includes/tcpdf/tcpdf.php
	htdocs/langs/el_GR/other.lang
	htdocs/langs/en_US/cashdesk.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/es_ES/products.lang
	htdocs/main.inc.php
	test/phpunit/NumberingModulesTest.php
 2013-06-09 16:49:47 +02:00
Laurent Destailleur
5a77828e62 New: Add object_hour as substitution tag for opendocument generation. 2013-06-08 18:12:32 +02:00
Laurent Destailleur
bd4ca9f1ed Merge remote-tracking branch 'origin/3.3' into 3.4 2013-06-08 16:55:49 +02:00
Laurent Destailleur
49dcc32374 Fix: Param lang forbidden into price function 2013-06-08 16:53:26 +02:00
Laurent Destailleur
b4abe58237 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2013-06-08 16:49:02 +02:00
Laurent Destailleur
5d1dfdc7c1 Upgrade tcpdf to 6.0 2013-06-08 16:29:59 +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
eadfa66f2c Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/infobox.class.php
 2013-06-04 22:59:28 +02:00
Laurent Destailleur
c6c4a83850 Fix: Removed deprecated code fo local tax type 7 since we can use now 
the fiscal stamp that is a better implementation.
 2013-06-04 12:04:04 +02:00
Laurent Destailleur
22bde298de Fix: First permission must start with 1 2013-06-03 23:06:15 +02:00
Laurent Destailleur
c1dd2f20cd Qual: Clean code. 2013-06-03 15:18:36 +02:00
Laurent Destailleur
da73a8d84c Fix: syntax error 
Fix: Bad field param
 2013-05-31 16:39:34 +02:00
Laurent Destailleur
a5962a410e Fix: Bad param used 2013-05-31 16:35:32 +02:00
Laurent Destailleur
0ec32afd8d Fix: syntax error 
Fix: Bad field param
 2013-05-31 13:30:24 +02:00
Laurent Destailleur
c285f81844 Fix: Bad param used 2013-05-31 13:21:01 +02:00
simnandez
7fa0d6cffa Fix: [ bug #916 ] Same for Thirds and Members 2013-05-30 18:00:08 +02:00
simnandez
5fa2598a6f Fix: [ bug #916 ] Same for Thirds and Members 2013-05-30 17:58:48 +02:00
Laurent Destailleur
5bba5782a4 Merge remote-tracking branch 'origin/3.4' into develop 2013-05-29 21:22:27 +02:00
simnandez
4f9b5883df Fix: [ bug #916 ] Products complementary attributes, imports and 
multicompany
Fix: [ bug #917 ] Missing field type in products complementary
attributes imports

No Changelog Update need, because complementary attributes is new in 3.4
 2013-05-29 18:18:24 +02:00
simnandez
00395c87a8 Fix: [ bug #916 ] Products complementary attributes, imports and 
multicompany
Fix: [ bug #917 ] Missing field type in products complementary
attributes imports

No Changelog Update need, because complementary attributes is new in 3.4
 2013-05-29 18:17:39 +02:00
Laurent Destailleur
b2600e8880 Fix: Missing trans 2013-05-29 02:20:30 +02:00
BENKE Charles
aa06a0b113 Update modSociete.class.php 
enhance filter on export of contact
add postorfunction field in export of contact
 2013-05-28 15:37:08 +02:00
BENKE Charles
ed67173734 Update modFournisseur.class.php 
Add filter feature on the commande export
 2013-05-24 16:17:36 +02:00
Laurent Destailleur
ee84457104 Fix: not defined default value 2013-05-23 10:04:35 +02:00
Laurent Destailleur
12681994ea Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/fichinter/fiche.php
 2013-05-20 21:21:03 +02:00
Laurent Destailleur
71e14df62f Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-05-20 17:37:08 +02:00
Christophe Battarel
f8ca842685 fix typo error 2013-05-20 10:10:34 +02:00
Christophe Battarel
347fc6d714 fix unauthorized access to margins for external user 2013-05-19 14:04:21 +02:00
Maxime Kohlhaas
57212d7db8 Add mobile phone in contact export 2013-05-17 17:29:41 +02:00
fhenry
faa2399b80 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog

Change-Id: I7abbbefde190dbe86f8cb7ae43451da9eca1c9aa
 2013-05-17 09:49:06 +02:00
Laurent Destailleur
b17fe9fc00 New: Export support now autosize of column for excel export. 
Fix: Bad charset when using script export-bank-receipts.
 2013-05-15 13:37:31 +02:00
Laurent Destailleur
f6dfcb756c Text cells must be left align into excel 2007 export. 2013-05-14 23:54:22 +02:00
fhenry
d0b4cef7a4 Change duration _planned by planned_workload 2013-05-14 20:22:33 +02:00
fhenry
f98442d700 Remove the option into admin screen 2013-05-14 09:24:05 +02:00
fhenry
aa7e3c2fdd [ task #892 ] Add option in thridparty customer/supplier admin to hide 
non active in select_company method
 2013-05-11 17:10:11 +02:00
Laurent Destailleur
6c4e47514d Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/holiday/fiche.php
 2013-05-11 15:26:24 +02:00
Regis Houssin
8836b30a02 Fix: missing rename note to note_private and add note_public 2013-05-07 14:26:51 +02:00
Regis Houssin
6ec81375c4 Fix: missing rename note to note_private and add note_public 2013-05-07 14:26:11 +02:00
Laurent Destailleur
8a82c8c5d5 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/contact/class/contact.class.php
	htdocs/margin/agentMargins.php
	htdocs/margin/tabs/productMargins.php
 2013-05-07 13:08:30 +02:00
simnandez
15ede98fe7 New: [ task #877 ] Reorganize menus. Init works 
Add migration script 3.4 to 3.5
 2013-05-04 01:22:09 +02:00
fhenry
95e4474906 Fix bug on PgSQL if user in on another entity than 1 2013-05-03 20:56:58 +02:00
Laurent Destailleur
880daa4375 Fix: log file permission during install 2013-05-03 11:51:26 +02:00
Laurent Destailleur
c17cd04686 Merge pull request #904 from defrance69/patch-5 
Update modSociete.class.php
 2013-05-03 01:09:37 -07:00
Laurent Destailleur
776655d8c6 Merge pull request #903 from defrance69/patch-4 
Update modProduct.class.php
 2013-05-03 01:09:29 -07:00
Laurent Destailleur
fc0d5abd14 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/fiche-stat.php
	htdocs/contact/class/contact.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modSociete.class.php
	htdocs/projet/fiche.php
	test/phpunit/FilesLibTest.php
 2013-05-03 00:15:02 +02:00
Laurent Destailleur
5c95018356 Fix: Avoid empty arrays 2013-05-01 16:00:06 +02:00
Laurent Destailleur
0a71c84bf4 Fix: Remove separator files. 2013-04-30 23:08:07 +02:00
Laurent Destailleur
7d71be2227 Fix: Import of contact/address not complete and not working with pgsql 
Conflicts:
	htdocs/core/modules/modSociete.class.php
 2013-04-30 22:56:52 +02:00
Laurent Destailleur
786bf9d035 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-30 22:39:17 +02:00
Laurent Destailleur
8c064c4883 Fix: Import of contact/address not complete and not working with pgsql 2013-04-30 19:02:02 +02:00
BENKE Charles
b1784ff247 Update modSociete.class.php 
add filter feature on extrafields
 2013-04-30 13:15:02 +03:00
BENKE Charles
3f6216e6d0 Update modProduct.class.php 
Add filtering feature on extrafields
 2013-04-30 13:12:54 +03:00
Grand Philippe
c4a064d104 fix: Undefined property: mod_codeclient_monkey::$prefixIsRequired 2013-04-28 19:35:10 +02:00
Laurent Destailleur
80e470a4ce Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/index.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/fourn/facture/impayees.php
	htdocs/holiday/class/holiday.class.php
	htdocs/holiday/fiche.php
 2013-04-28 01:24:58 +02:00
Marcos García
36574771a6 Translation of barcode internal engine string 2013-04-27 12:49:19 +02:00
Laurent Destailleur
0a282c018a Merge pull request #886 from jfefe/doc_ods 
Using of MAIN_DOC_USE_TIMING on ODT
 2013-04-26 13:04:08 -07:00
Laurent Destailleur
162cb4ffea Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-26 19:17:51 +02:00
Laurent Destailleur
2a74cb81f0 Fix: Removed warnings 2013-04-26 19:13:39 +02:00
jfefe
8835868749 Implement MAIN_DOC_USE_TIMING into project and order ODT 2013-04-26 08:48:44 +02:00
jfefe
8a958c31e3 Use MAIN_DOC_USE_TIMING on invoices (odt) 2013-04-26 08:48:44 +02:00
jfefe
036e81a089 Use MAIN_DOC_USE_TIMING on proposals (ODT) 2013-04-26 08:48:44 +02:00
jfefe
bfc15fb99f Change name of hidden option to add timing in filename (MAIN_DOC_USE_TIMING) 2013-04-26 08:48:43 +02:00
Laurent Destailleur
271dcf578f Fix: Better error message during import of csv with records split onto 
several lines.
 2013-04-25 23:49:24 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
simnandez
436b6259c0 Fix: finish merge 2013-04-24 16:57:46 +02:00
fhenry
41c8a9aa6a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-24 15:07:03 +02:00
Laurent Destailleur
bca399623f Fix: finish merge 2013-04-24 12:44:36 +02:00
fhenry
bd1b440743 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-23 23:28:44 +02:00
Laurent Destailleur
854b9df96d Qual: Clean code of box management 2013-04-23 16:18:26 +02:00
Laurent Destailleur
7dce8d2306 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/launchpad/README
	build/makepack-dolibarr.pl
	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/core/modules/syslog/mod_syslog_file.php
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php
 2013-04-23 14:04:56 +02:00
Laurent Destailleur
3f1f065d4e Fix: log must use the mask defined into setup 
Conflicts:
	htdocs/core/modules/syslog/mod_syslog_file.php
 2013-04-23 12:02:56 +02:00
Laurent Destailleur
78a0c7ace2 Fix: log must use the mask defined into setup 2013-04-23 12:00:02 +02:00
Laurent Destailleur
c8b2ce3d8e Removed warning 2013-04-22 20:46:53 +02:00
Laurent Destailleur
494e9dbe18 Removed warning 2013-04-22 20:45:47 +02:00
fhenry
3fdc57cc56 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-22 16:20:35 +02:00
fhenry
ee4839c92e Better management for ODT to PDF 2013-04-22 15:50:26 +02:00
Regis Houssin
ab4a3dcaa7 Fix: missing rename field 2013-04-22 10:18:03 +02:00
JF FERRY
642ba10d84 New hidden option to introduce timing value into odt document nam 2013-04-21 17:04:54 +02:00
JF FERRY
83028b958a Task #838 : retieve extension to work with ods document 2013-04-21 15:12:48 +02:00
JF FERRY
fcf1eeba20 Task #838 - change regex to look at ods document too 2013-04-21 14:55:32 +02:00
Laurent Destailleur
a7f169d102 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-20 23:43:19 +02:00
Laurent Destailleur
c282ff91d6 Fix: pgsql compatibility 2013-04-20 23:43:02 +02:00
Laurent Destailleur
9c11b6a246 Merge pull request #851 from FHenry/develop 
Add hidden option MAIN_ODT_AS_PDF to save ODT as PDF
 2013-04-20 12:02:16 -07:00
Maxime Kohlhaas
cf945f0187 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-04-20 13:00:33 +02:00
fhenry
413ee7ec78 Add hidden option MAIN_ODT_AS_PDF to save ODT as PDF (only if 
libreoffice/jodconverter/exec shell right)
 2013-04-20 10:44:01 +02:00
Maxime Kohlhaas
bfb05c78cd Change carrier config into dict instead of dedicated conf page 2013-04-19 20:20:10 +02:00
Laurent Destailleur
08ae1d289b Pgsql compatibility 2013-04-19 15:02:53 +02:00
Laurent Destailleur
df0b0ebf51 Fix: Uniformize pdf code for typhon. This should also solve problem 
of overlapped text into delivery receipts.

Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
 2013-04-19 09:52:25 +02:00
Laurent Destailleur
5c1b3d86c3 Fix: Uniformize pdf code for typhon. This should also solve problem 
of overlapped text into delivery receipts.
 2013-04-19 09:44:37 +02:00
Juanjo Menent
fa4490ef79 Merge pull request #840 from FHenry/develop 
[ task #741 ] Gestion des interventions/Add intervention box
 2013-04-17 07:59:34 -07:00
Laurent Destailleur
bcacbab481 Qual: No need to use two menu entries for this. 2013-04-17 16:26:14 +02:00
fhenry
4927aae891 [ task #741 ] Gestion des interventions/Add intervention box 2013-04-17 16:20:01 +02:00
Laurent Destailleur
de2ddc02e4 Qual: Another clean of menu management system. Removed all files 
pre.inc.php
 2013-04-15 13:11:29 +02:00
Juanjo Menent
de19af9e9f Merge pull request #825 from FHenry/develop 
[ task #814 ] Add extrafield feature into Project/project tasks module
 2013-04-14 05:15:17 -07:00
Laurent Destailleur
3cec5bfc40 doxygen 2013-04-14 11:22:00 +02:00
fhenry
00fb40e073 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/es_ES/admin.lang

Change-Id: I3c2c0789a92fb3d5506c717986ce0127dec75b9b
 2013-04-14 09:40:01 +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
6e495bfbe1 Fix: lang loading 2013-04-13 14:38:26 +02:00
fhenry
cc497490eb [ task #814 ] Add extrafield feature into Project/project tasks module 2013-04-12 11:09:53 +02:00
Laurent Destailleur
8e3f0172fc Fix: Fix tons of pb with num ref system of supplier invoices. 2013-04-12 00:00:31 +02:00
fhenry
629ef78dc8 Add subtitution inside header and fotter document 2013-04-11 18:38:50 +02:00
fhenry
2f7be8d2c2 Add hook for substitution 2013-04-11 17:31:24 +02:00
fhenry
6335918d72 Quel : indentation 2013-04-11 17:06:53 +02:00
fhenry
2440513007 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/opensurvey/fonctions.php
	htdocs/opensurvey/public/choix_date.php
	htdocs/opensurvey/public/create_survey.php
	htdocs/opensurvey/public/exportcsv.php
	htdocs/public/paybox/paymentko.php

Change-Id: I57468f3a0f6bb1115bd48b84517060432102c2ea
 2013-04-11 10:04:27 +02:00
Laurent Destailleur
792341a4b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
 2013-04-11 07:39:16 +02:00
fhenry
98ddd02a32 Qual : PHP Code_Sniffer 2013-04-10 19:55:21 +02:00
Laurent Destailleur
a32a02e4c1 Fix: Removed warnings 2013-04-10 16:51:13 +02:00
Laurent Destailleur
d7c0cf3d50 Fix: More complete fix for emailing contact selectors. 2013-04-10 16:29:53 +02:00
Regis Houssin
19e902ef8f Fix: filter on all contacts, not just those related to a company 2013-04-10 16:00:30 +02:00
Regis Houssin
740bc2a656 Fix: filter on all contacts, not just those related to a company 2013-04-10 15:59:54 +02:00
Regis Houssin
8118332dfb Fix: security 
Conflicts:
	htdocs/core/modules/mailings/contacts2.modules.php
 2013-04-10 13:00:05 +02:00
Laurent Destailleur
ba93a4bfe2 Fix: Codesniffer 2013-04-10 12:20:45 +02:00
Regis Houssin
2c51b51a88 Fix: security 2013-04-10 11:56:19 +02:00
Laurent Destailleur
538194f435 New: Add module opensurvey. Final. Test are welcome. 2013-04-09 23:05:50 +02:00
frederic34
61b4305949 Merge remote-tracking branch 'upstream/develop' into develop 2013-04-09 17:33:09 +02:00
fhenry
275bf67bb7 [ task #811 ] Uniformanize note field 2013-04-09 17:18:07 +02:00
fhenry
6379b74099 Fix bug on ODT template path for order and projects 2013-04-08 18:02:12 +02:00
frederic34
40f11206de Merge remote-tracking branch 'upstream/develop' into develop 
Conflicts:
	htdocs/commande/fiche.php
 2013-04-08 11:33:45 +02:00
Marcos García
6252857440 Fixed translations and BILL_SUPPLIER_BUILDDOC trigger 2013-04-06 17:56:10 +02:00
fhenry
2b0668bf81 Add paiement mode et delay on PDF muscadet 2013-04-06 13:38:32 +02:00
fhenry
9ff559b033 Add wished delivery date into supplier orders PDF muscadet 2013-04-06 13:06:26 +02:00
fhenry
0aba3cfc05 Fix order_supplier and invoice_supplier PDF model name 2013-04-06 13:00:41 +02:00
fhenry
cc465380da Fix upgrade bug (llx_printer_ipp) wrong syntax (my fault, sorry) 2013-04-06 12:20:19 +02:00
Laurent Destailleur
1cf2276584 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/prospect/list.php
 2013-04-05 22:59:06 +02:00
fhenry
81b34f9918 Fix Error come from [Dolibarr-dev] Errors on comm/mailing/index.php page 
mail
 2013-04-05 09:23:31 +02:00
fhenry
c109467d20 Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse... 2013-04-04 13:58:33 +02:00
Stephen L
cb3f183353 Add: ODTSubstitution and ODTSubstitutionLine hooks with $odfHandler for extended ODT substitution 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2013-04-03 00:57:40 +02:00
Laurent Destailleur
4c1f17f42f Qual: More robust error management for menu description 2013-03-30 19:11:52 +01:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh 
Convert DOS files to unix
 2013-03-30 14:27:13 +01:00
Laurent Destailleur
97a90b0904 New: Add more ODT tags 2013-03-29 16:45:40 +01:00
Laurent Destailleur
4c47393b51 Fix: Add more ODT tags 2013-03-29 16:18:55 +01:00
Laurent Destailleur
2e3fd0083a Merge pull request #785 from FHenry/develop 
Add more information in ODT project template
 2013-03-28 15:40:46 -07:00
fhenry
c2be118efd Add more information in ODT project template 2013-03-28 20:51:00 +01:00
Laurent Destailleur
07062065e5 Merge pull request #782 from jfefe/propal_odt_choice 
New : can choose to generate the ODT document according to the status of a propale
 2013-03-27 13:35:34 -07:00
jfefe
1f537300ea Add hidden option MAIN_PROPAL_CHOOSE_ODT_DOCUMENT to enable choice of ODT document to use according to his status 2013-03-27 19:11:42 +01:00
jfefe
ee52e1a487 Merge remote-tracking branch 'upstream/develop' into propal_odt_choice 2013-03-27 15:25:13 +01:00
fhenry
9507f4258b Add inforamtion on Project into ODT project 2013-03-26 23:32:22 +01:00
frederic34
1cd39df82b Merge remote-tracking branch 'upstream/develop' into develop 2013-03-26 10:24:46 +01:00
frederic34
4c29eaecd1 Print IPP 2013-03-26 10:23:00 +01:00
Laurent Destailleur
55a9d3abf1 Merge pull request #776 from FHenry/develop 
[ task #770 ] Add ODT document generation for Projects module
 2013-03-25 15:52:30 -07:00
fhenry
9dd4ed9cb8 [ task #770 ] Add ODT document generation for Projects module 2013-03-25 19:28:34 +01:00
BENKE Charles
8b160ac712 Update modAgenda.class.php 
Add export feature of calendar module
 2013-03-25 18:26:35 +01:00
Laurent Destailleur
ff2407a454 Add hidden option to setup font size of information. 2013-03-24 14:01:33 +01:00
Laurent Destailleur
c3589e9785 Some debug into cron module: 
- Because cron is a module, constant must start with CRON_.
- Miscellanous fixes.
- For external link to run jobs from url, we must forge url using conf
file and not autodetect url.
 2013-03-23 19:23:17 +01:00
Laurent Destailleur
9fe0d2cdd2 Fix: Removed a lors 'pre'. Also accurency of data must not be overwrite 
by odt template engine (to be compatible with all countries precision).
 2013-03-23 18:22:25 +01:00
Laurent Destailleur
73de8d169f Fix: Avoid call method on non object error 2013-03-23 18:04:46 +01:00
Laurent Destailleur
fbf8d410d2 New: Support revenue stamp onto invoices 2013-03-23 17:34:23 +01:00
Laurent Destailleur
350bcea183 Merge 2013-03-22 17:10:17 +01:00
Laurent Destailleur
bf912e2c78 Fix: Some bug into supplier pdf invoice setup. 2013-03-19 15:19:31 +01:00
Christophe Battarel
e2f28b6c51 remove experimental commissions module 2013-03-18 15:40:56 +01:00
Laurent Destailleur
45a6717dd3 Merge pull request #752 from FHenry/develop 
task #768  &  task #769
 2013-03-18 05:02:38 -07:00
Laurent Destailleur
c6b4259735 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-03-17 19:40:41 +01:00
Laurent Destailleur
7703537b96 New: Work on cron module 2013-03-17 19:39:53 +01:00
Grand Philippe
29b8ce1c2d try to fix: supplier invoice numbering 2013-03-17 15:27:52 +01:00
Grand Philippe
6afa1cb2c9 normalize 2013-03-17 14:40:49 +01:00
Grand Philippe
57d20e28fb normalize and simplify code 2013-03-17 12:56:54 +01:00
Grand Philippe
88256b7531 normalize 2013-03-17 10:21:44 +01:00
Grand Philippe
bda1c7656b Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-03-17 10:03:29 +01:00
Grand Philippe
d2c10159fe try to fix : cannot display numbering models 2013-03-16 17:10:24 +01:00
Laurent Destailleur
33a7692fbc Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/exports/class/export.class.php
 2013-03-16 17:07:35 +01:00
Grand Philippe
86dff79b73 try to fix : cannot display numbering models 2013-03-16 16:58:45 +01:00
Grand Philippe
7a69066dc8 enhancement of suppliers module 2013-03-16 15:24:14 +01:00
Grand Philippe
cdb521663e Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-03-16 10:35:12 +01:00
fhenry
98cc7b7a2b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-16 09:43:57 +01:00
fhenry
e71103ed02 task #768: 
https://doliforge.org/tracker/?func=detail&aid=768&group_id=144 
task #769 :
https://doliforge.org/tracker/?func=detail&aid=769&group_id=144
 2013-03-16 09:23:34 +01:00
jfefe
65a9edd5a7 Fix : lang 2013-03-16 01:52:56 +01:00
jfefe
5f1141675c Add constants into config of ODT document for propal : can choose wich ODT will be used on creation and when close to bill or not. 2013-03-16 01:10:21 +01:00