lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,288 Commits 43 Branches 150 Tags 886 MiB
8348596aea
Commit Graph

3014 Commits

Author SHA1 Message Date
Christophe Battarel
4b1ae9e9a9 add ability to include products on intervention card (some companies prefer to have both products and services on the intervention card that they give to their consultant) 2013-05-21 11:44:11 +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
Grand Philippe
5f714f1403 fix: wrong trad 2013-05-20 14:39:27 +02:00
fhenry
5d73ce4023 [ task #901 ] Add Extrafeild on Fiche Inter 2013-05-18 12:53:11 +02:00
Laurent Destailleur
bab4e1e509 Fix: PHP version was lost 
Fix: split of long text to avoid horizontal scrolls
 2013-05-16 15:15:30 +02:00
Laurent Destailleur
ad5a350073 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-05-16 15:06:13 +02:00
Laurent Destailleur
37fa25c1ab Fix: PHP version was lost 
Fix: split of long text to avoid horizontal scrolls
 2013-05-16 15:02:26 +02:00
Laurent Destailleur
fb92e13650 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	scripts/invoices/email_unpaid_invoices_to_customers.php
	scripts/invoices/email_unpaid_invoices_to_representatives.php
 2013-05-15 22:35:41 +02:00
Laurent Destailleur
626362780a Fix: Remove not used constant 2013-05-15 17:30:18 +02:00
Marcos García
e86a742383 Added missing translations 2013-05-08 17:56:32 +02:00
Marcos García
e18eb3a6b3 Added missing translations 2013-05-08 17:20:20 +02:00
Marcos García
edfcfb9bbd Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into translations-develop 
Conflicts:
	htdocs/admin/commande.php
	htdocs/admin/expedition.php
	htdocs/admin/facture.php
	htdocs/admin/fichinter.php
	htdocs/admin/livraison.php
	htdocs/admin/supplier_invoice.php
	htdocs/admin/supplier_order.php
	htdocs/societe/admin/societe.php
 2013-05-08 15:37:41 +02:00
Marcos García
3d5cb4e8de Style improvements in model document selector 2013-05-07 22:48:03 +02:00
Marcos García
54a2d3ca72 Corrected translations of info tooltips in document models description 2013-05-07 22:04:08 +02:00
Laurent Destailleur
f6c2bd4928 Fix: Uniformize menu conditions 2013-04-28 23:25:28 +02:00
fhenry
c988944f1a PDF admin : Add option to hide num TVA intra into adress of customer 2013-04-26 13:25:51 +02:00
fhenry
a06581771c Reveiw extrafield for womplaiance with wiki 
http://wiki.dolibarr.org/index.php/Extrafields
 2013-04-26 10:29:14 +02:00
Laurent Destailleur
edc84f4168 Fix: Label must be same into combo list than into admin page. 2013-04-25 13:12:57 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
Laurent Destailleur
854b9df96d Qual: Clean code of box management 2013-04-23 16:18:26 +02:00
Laurent Destailleur
2c4515f40e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-22 20:00:01 +02:00
Laurent Destailleur
5d74f228d8 Removed version into trigger page (version on trigger is useless since 
trigger depend on module. Only version of module is required).
 2013-04-22 19:59:41 +02:00
Regis Houssin
7f6a87ab35 FIXME regresion if code with not in numeric base 2013-04-22 16:44:25 +02:00
Laurent Destailleur
89ad634230 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/langs/fr_FR/holiday.lang
 2013-04-22 01:39:49 +02:00
Laurent Destailleur
f4513d1beb Move option ate better place 2013-04-21 16:01:36 +02:00
Laurent Destailleur
12caa20e38 Merge pull request #850 from atm-maxime/develop 
Carrier conf modification
 2013-04-20 11:42:44 -07:00
Maxime Kohlhaas
cf945f0187 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-04-20 13:00:33 +02:00
Marcos García
c3c57351d0 Updated copyright 2013-04-20 12:57:50 +02:00
Marcos García
651b1ae7ce Refactor + es_ES translations improvement + minor stetic change 2013-04-20 12:55:31 +02:00
fhenry
e2d0d0d414 Fix fix as Eldy wish it 2013-04-20 00:10:20 +02:00
Marcos García
40a9ab9772 Added missing translations 2013-04-20 00:08:09 +02:00
Marcos García
458b1cdf60 Improved dictionary translations + minor bug fix 2013-04-19 23:33:54 +02:00
Maxime Kohlhaas
bfb05c78cd Change carrier config into dict instead of dedicated conf page 2013-04-19 20:20:10 +02:00
Maxime Kohlhaas
26aba2b609 Add tracking url for carriers in dict 2013-04-19 19:46:49 +02:00
Marcos García
becd40a825 Fixed bug #828: Error when code_region is not a number in llx_c_regions (with postgres) 2013-04-19 15:38:24 +02:00
fhenry
c0c1de7992 [ task #826 ] Increasing stock when deleting an invoice 2013-04-18 08:40:29 +02:00
fhenry
1b044fd9d6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-16 20:07:42 +02:00
Laurent Destailleur
d28316f4a8 Look: Optimize size 2013-04-16 16:33:05 +02:00
fhenry
7e3ca0ce16 Fix bug 
http://www.dolibarr.org/forum/527-bugs-on-a-stable-version/22542-table-prefix-bug#22548
 2013-04-16 16:02:13 +02:00
fhenry
e2156b5df7 Fix bug 
http://www.dolibarr.org/forum/527-bugs-on-a-stable-version/22542-table-prefix-bug
 2013-04-16 16:00:23 +02:00
Marcos García
16afa18e95 Improved and added missing es_ES translations 2013-04-15 00:09:29 +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
fhenry
cc497490eb [ task #814 ] Add extrafield feature into Project/project tasks module 2013-04-12 11:09:53 +02:00
fhenry
5d94b0c576 Fix bug : change path of ODT template for commande and propal module 2013-04-10 16:34:06 +02:00
fhenry
38e30836a5 Fix bug with multicompany (SYSLOG_FILE on wrong entity) 2013-04-10 15:08:03 +02:00
Laurent Destailleur
6a519cd88c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-09 23:06:18 +02:00
Laurent Destailleur
a4b56708e9 Better error management 2013-04-09 23:04:59 +02:00
fhenry
2ca18ace30 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-09 21:58:39 +02:00
fhenry
04e933c40f Fix : admin ODT doctemplate path commande/project 2013-04-09 21:58:25 +02:00