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
|
d992d5cb22
|
Fix: Bad SQL request when using filter on category.
|
2014-01-03 18:16:21 +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
|
165f9617e9
|
Fix: No hard coded data
|
2014-01-02 10:55:11 +01:00 |
|
Laurent Destailleur
|
5fd47b34b0
|
Fix: Bad link for download file into documents page of supplier invoices
|
2014-01-01 18:30:32 +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
|
808abb6b4e
|
Restore correct date
|
2013-12-31 16:03:58 +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
|
7fc052ce19
|
More prerequisites to check to run makepack-dolibarr to build debian
package (check on dpatch too).
|
2013-12-31 15:27:15 +01:00 |
|
Laurent Destailleur
|
50df4e1ff1
|
Fix: Update doc and packager for doliwamp
Conflicts:
build/exe/doliwamp/doliwamp.iss
Conflicts:
build/exe/doliwamp/doliwamp.iss
|
2013-12-31 15:23:16 +01:00 |
|
Laurent Destailleur
|
13eff7d629
|
More prerequisites to check to run makepack-dolibarr to build debian
package (check on dpatch too).
|
2013-12-31 15:19:39 +01:00 |
|
Laurent Destailleur
|
6d40c10b95
|
Prepare 3.5.0 release
|
2013-12-31 15:18:11 +01:00 |
|
Laurent Destailleur
|
247c49e094
|
Prepare 3.5.0 release
|
2013-12-31 15:17:10 +01:00 |
|
Laurent Destailleur
|
bec70d1f0e
|
Fix: Update doc and packager for doliwamp
Conflicts:
build/exe/doliwamp/doliwamp.iss
|
2013-12-31 15:09:38 +01:00 |
|
Laurent Destailleur
|
f0eb9b8a15
|
More prerequisites to check to run makepack-dolibarr to build debian
package (check on dpatch too).
|
2013-12-31 15:06:25 +01:00 |
|
Laurent Destailleur
|
f44a45feb2
|
Fix: Missing some languages into the transifex sync script.
Trans: Sync language files from transifex.
|
2013-12-31 12:03:37 +01:00 |
|
Laurent Destailleur
|
0bf88ce44f
|
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
|
2013-12-31 10:48:51 +01:00 |
|
Laurent Destailleur
|
e142bd252d
|
Fix: disable code making jmobile crazy.
|
2013-12-31 10:48:15 +01:00 |
|
Laurent Destailleur
|
2e0fc364bd
|
Merge remote-tracking branch 'origin/3.4' into 3.5
|
2013-12-30 12:42:14 +01:00 |
|
Laurent Destailleur
|
f0bda47d96
|
Merge remote-tracking branch 'origin/3.3' into 3.4
|
2013-12-30 12:39:30 +01:00 |
|
Laurent Destailleur
|
a59a0151fb
|
Fix: Removed analytics tags
|
2013-12-30 12:35:32 +01:00 |
|
Laurent Destailleur
|
cfb791c584
|
Fix: Better translation
|
2013-12-29 19:30:11 +01:00 |
|
Laurent Destailleur
|
436f585b69
|
Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
build/exe/doliwamp/doliwamp.iss
|
2013-12-29 00:48:31 +01:00 |
|
Laurent Destailleur
|
3e39cd279d
|
Fix: avoid to include not desired directory
|
2013-12-29 00:42:53 +01:00 |
|
Laurent Destailleur
|
8248f63826
|
Fix: Missing translation
|
2013-12-27 20:31:57 +01:00 |
|
Laurent Destailleur
|
29ae579298
|
Fix: Bad link
|
2013-12-27 20:29:30 +01:00 |
|
Laurent Destailleur
|
8207b7c243
|
Missing translation
|
2013-12-27 20:27:17 +01:00 |
|
Laurent Destailleur
|
d07c767f25
|
Fix: Alignement of element into block login
|
2013-12-27 17:55:24 +01:00 |
|
Laurent Destailleur
|
538e6c5dc2
|
Fix: Alignement of element into block login
|
2013-12-27 17:51:36 +01:00 |
|
Laurent Destailleur
|
da2f35e1a2
|
Fix: Missing translation.
Fix: Title of tab not visible
|
2013-12-27 17:43:52 +01:00 |
|
BENKE Charles
|
94bf105b13
|
Update llx_projet_task.sql
new field "ref" present on update sql but not on the table
|
2013-12-27 17:14:56 +01:00 |
|
Laurent Destailleur
|
3bb4de3e86
|
Better translation
|
2013-12-27 15:56:00 +01:00 |
|
Laurent Destailleur
|
94a217bdc1
|
Merge remote-tracking branch 'origin/3.4' into 3.5
|
2013-12-26 19:41:59 +01:00 |
|
Laurent Destailleur
|
a7d0a7d663
|
Merge remote-tracking branch 'origin/3.3' into 3.4
|
2013-12-26 19:40:56 +01:00 |
|
Laurent Destailleur
|
fce34301f9
|
More test to avoid errors when env is not complete.
|
2013-12-26 19:39:29 +01:00 |
|
simnandez
|
91b104aeb8
|
Fix: setup not saving changes
|
2013-12-26 11:32:13 +01:00 |
|
Laurent Destailleur
|
22412443fe
|
Fix: Overwrite bad value of limit payment date only if payment date is
defined.
|
2013-12-25 18:12:13 +01:00 |
|
Laurent Destailleur
|
76e4ba06a4
|
Fix: Calulcation of oustanding amount must not include abandonned
invoices.
|
2013-12-25 17:36:37 +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 |
|
simnandez
|
8c9d145759
|
Fix: Bad url destination into category remove
|
2013-12-24 13:39:58 +01:00 |
|
simnandez
|
d6b2f96c19
|
Fix: Some config data are shared between suppliers orders and suppliers
invoices
|
2013-12-23 16:38:38 +01:00 |
|
Laurent Destailleur
|
81f1098d41
|
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
|
2013-12-23 12:06:07 +01:00 |
|
Laurent Destailleur
|
331341bf5a
|
Fix: Bad picto
|
2013-12-23 12:05:32 +01:00 |
|
Laurent Destailleur
|
39e2c3262a
|
Merge pull request #1355 from FHenry/3.4
Fix [ bug #1202 ] Wrong amount in deposit % invoice from proposal
|
2013-12-23 02:21:23 -08:00 |
|