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

945 Commits

Author SHA1 Message Date
Laurent Destailleur
748d769140 Fix: [ bug #1280 ] service with not end of date was tagged as expired. 2014-03-02 15:50:26 +01:00
Laurent Destailleur
c6fb7996ba Fix: [ bug #1238 ] When creating accompte with a %, free product are 
used for calculation.
 2014-03-01 19:11:13 +01:00
Laurent Destailleur
b6cefee45a Fix: [ bug #1240 ] traduction 2014-03-01 15:21:11 +01:00
Laurent Destailleur
0b83f1a670 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-03-01 15:06:25 +01:00
Laurent Destailleur
8d28087e69 Fix: [ bug #1206 ] PMP price is bad calculated 2014-03-01 14:58:33 +01:00
Laurent Destailleur
a084887442 Merge branch 'project-translations' of 
https://github.com/marcosgdf/dolibarr into
marcosgdf-project-translations

Conflicts:
	ChangeLog
 2014-03-01 13:38:50 +01:00
Laurent Destailleur
19b68e87e9 Merge branch 'bug-1123' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1123

Conflicts:
	ChangeLog
 2014-03-01 13:29:34 +01:00
simnandez
8ffa11fe16 Fix: Loading actions extrafields fails. 2014-02-26 16:50:38 +01:00
Marcos García de La Fuente
968b5771db Corrected project contact types translation 2014-02-25 02:42:10 +01:00
Marcos García de La Fuente
e83e2bbbd7 Fixed bug #1123: Paid deposit invoices are always shown as partially paid when fully paid 2014-02-25 01:17:38 +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
simnandez
7511f626b3 Fix: Action event SHIPPING_VALIDATE is not implemented 2014-02-19 17:32:20 +01:00
Laurent Destailleur
4915ec8916 Fix: Bad space in predefined messages. 
Fix: Signature was not added for email sent from thirdparty page.
 2014-02-19 15:33:04 +01:00
Laurent Destailleur
1cfcda702e Fix: [ bug #1250 ] "Supplier Ref. product" sidebar search box does not 
work.
 2014-02-17 17:32:25 +01:00
Laurent Destailleur
de64ce5b2a Fix: user right on Holiday for month report nor working 2014-02-17 00:09:48 +01:00
Laurent Destailleur
abc96b51fa Enable extrafields for customer order, proposal and invoice lines. This 
feature was developed for 3.5 but was disabled (hidden) because of
a bug not possible to fix enough quickly for 3.5.0 release.
 2014-02-16 23:51:29 +01:00
Laurent Destailleur
4b8d39af9d Fix: Do not report trigger errors twice. 
Fix: Error when creating event was not reported.

Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-14 13:05:04 +01:00
Laurent Destailleur
fdfb7f1a8a Fix: Be sure there is no duplicate default rib. 2014-02-08 03:24:48 +01:00
Laurent Destailleur
5b89bc18f5 [ bug #1231 ] PDF always generated in interventions 2014-02-08 02:46:05 +01:00
Laurent Destailleur
b750e98d40 Fix: Pb of file upload and download. 2014-02-08 02:02:01 +01:00
Laurent Destailleur
35ddcf2958 Remove from changelog because feature is not stable. 2014-01-30 01:42:32 +01:00
Laurent Destailleur
fb0a4803c2 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/main.lang
 2014-01-20 02:40:06 +01:00
Laurent Destailleur
0d18892506 Merge from 3.4 2014-01-20 02:21:30 +01:00
Laurent Destailleur
8642e2027c Fix: [ bug #1212 ] 'jqueryFileTree.php' directory traversal 
vulnerability
 2014-01-20 02:10:16 +01:00
Laurent Destailleur
eae92695d6 Fix: Warning into bank conciliation feature. 2014-01-09 18:47:33 +01:00
Laurent Destailleur
2b4f0bd4b1 Fix: Add a limit into list to avoid browser to hang when database is too 
large.
 2014-01-09 14:28:32 +01:00
simnandez
b8550bb985 Fix: Bad get of localtaxes into contracts add lines 2014-01-07 12:16:56 +01:00
simnandez
d4db5916f0 Fix: Bad get of localtaxes into contracts add lines 2014-01-07 12:16:16 +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
Laurent Destailleur
555a49d66e Update doc 2014-01-05 01:20:27 +01:00
Laurent Destailleur
f0503dfaa9 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	ChangeLog
	htdocs/compta/stats/cabyprodserv.php
	htdocs/compta/stats/casoc.php
 2014-01-03 18:28:00 +01:00
Laurent Destailleur
8d66497384 Update doc for 3.4.2 2014-01-03 18:23:07 +01:00
Laurent Destailleur
0bdcda50c6 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	ChangeLog
	build/exe/doliwamp/doliwamp.iss
	build/pad/pad_dolibarr.xml
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
 2013-12-31 16:13:12 +01:00
Laurent Destailleur
b1ea05e0d1 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/pad/pad_dolibarr.xml
	build/pad/pad_doliwamp.xml
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
 2013-12-31 15:55:10 +01:00
Laurent Destailleur
0e54780377 Fix: Update doc and packager for doliwamp 
Conflicts:
	build/exe/doliwamp/doliwamp.iss

Conflicts:
	build/exe/doliwamp/doliwamp.iss

Conflicts:
	build/exe/doliwamp/doliwamp.iss
 2013-12-31 15:41:25 +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
simnandez
d6b2f96c19 Fix: Some config data are shared between suppliers orders and suppliers 
invoices
 2013-12-23 16:38:38 +01:00
Florian Henry
e971e4dfff Fix [ bug #1202 ] Wrong amount in deposit % invoice from proposal 2013-12-23 11:05:14 +01:00
simnandez
a1e0d84e37 Fix: Lost stats filters into year selection 2013-12-19 15:43:22 +01:00
Marcos García
d65374bb02 Fixed bug #1196: Product barcode search does not expect 13th digit on EAN13 type 
Some code written by "hipnosapo" forum user in http://www.dolibarr.es/index.php/foro/7-bugs-versiones-estables/3891-ean13-buscador-codigo-barras-13-digitos#3891
 2013-12-15 18:44:53 +01:00
Laurent Destailleur
dc754bbdc2 Fix: Trigger name conflicts and reference file was not matching real 
name of triggers.
 2013-12-14 20:48:34 +01:00
Laurent Destailleur
72250f656e Merge remote-tracking branch 'origin/3.4' into 3.5 2013-12-09 02:17:43 +01:00
Marcos García de La Fuente
beb93e9245 Resolved bug #1182: ODT company_country tag is htmlencoded 2013-12-08 20:23:44 +02:00
Laurent Destailleur
37b0780523 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/ecm/tpl/builddatabase.tpl.php
	htdocs/fourn/commande/liste.php
	htdocs/product/admin/product_tools.php
 2013-12-08 00:42:36 +01:00
Florian Henry
bc4cfd66db Fix: fix unsubscribe URL into mailing when sending manually (not by 
script)
 2013-12-02 15:07:34 +01:00
Florian Henry
11efc20755 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 
Conflicts:
	ChangeLog

Change-Id: I90f7ee62c65ef449c8ca43857d9743d0d953cf4b
 2013-12-01 22:50:18 +01:00
Florian Henry
c6991f97d4 [ bug #1174 ] Product translated description not good into PDF 
Country
 2013-12-01 22:47:22 +01:00
Laurent Destailleur
4aea74d6fd Fix: [ bug #1171 ] Documents lost in interventions after validating 2013-12-01 21:05:22 +01:00
Laurent Destailleur
131bbce6f3 Update changelog 2013-12-01 20:17:22 +01:00