Commit Graph

42271 Commits

Author SHA1 Message Date
Laurent Destailleur
0ff9533786 Missing css 2013-12-02 20:30:15 +01:00
Laurent Destailleur
2c92818488 Missing translations 2013-12-02 20:12:48 +01:00
Alexis Algoud
c49aabe574 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5 2013-12-02 16:06:58 +01:00
Alexis Algoud
bb191021de Add entitytotest test, because a LDAP user can override the entity restriction without this test 2013-12-02 16:04:30 +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
Laurent Destailleur
b6a910cf34 Fix: jmobile is crazy, we can disable it 2013-12-02 12:34:46 +01:00
Alexis Algoud
38c7c609bc Error on mercure bill's number function.
Ex draft bill for november :
mask = FC{yy}{mm}{000@99}
{mm} = 11
On validation, number -> FC131160 instead of FC131112
2013-12-02 11:42:39 +01:00
Florian Henry
3e712c9c8c Finnaly make it works 2013-12-02 11:11:08 +01:00
Florian Henry
0907d81fcb Avoid strpos bug if string is empty or null 2013-12-02 11:05:07 +01:00
Florian Henry
1ad1b25f6e remove useless space 2013-12-02 10:29:58 +01:00
Florian Henry
1b38d36f28 Better Fix 2013-12-02 10:27:41 +01:00
Laurent Destailleur
38e695b960 Look: Better support for jmobile 2013-12-02 07:38:37 +01:00
Laurent Destailleur
b12fb56be4 Fix regression 2013-12-02 05:59:11 +01:00
Laurent Destailleur
f45a31969b Fix regression 2013-12-02 05:52:41 +01:00
Laurent Destailleur
1e50543496 Merge pull request #1331 from GPCsolutions/35b-review
Fixes for 3.5 beta
2013-12-01 20:34:51 -08:00
Florian Henry
c0ef63fd74 Bteer fix 2013-12-02 00:22:49 +01:00
Florian Henry
ff9c84fd0e Better test for HTMLentities desc translation 2013-12-02 00:20:50 +01:00
Laurent Destailleur
6c26684284 Fix: [ bug #1166 ] Supplier account number in its card does not respect
order set in Banks module.
2013-12-01 23:17:16 +01:00
Laurent Destailleur
c475346248 Fix: [ bug #1166 ] Supplier account number in its card does not respect
order set in Banks module.
2013-12-01 23:16:18 +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
c54c06e8d3 Fix: [ bug #1171 ] Documents lost in interventions after validating 2013-12-01 21:04:52 +01:00
Laurent Destailleur
45b1273992 Fix: [ bug #1171 ] Documents lost in interventions after validating 2013-12-01 21:03:49 +01:00
Laurent Destailleur
f7d855f4ce Fix: [ bug #1171 ] Documents lost in interventions after validating 2013-12-01 21:03:12 +01:00
Laurent Destailleur
131bbce6f3 Update changelog 2013-12-01 20:17:22 +01:00
Laurent Destailleur
2f88406677 Fix: [ bug #1075 ] POS module doesn't decrement stock of products in
Delayed payment mode.
2013-12-01 20:15:08 +01:00
Laurent Destailleur
dbd1c57f0a Fix: [ bug #1075 ] POS module doesn't decrement stock of products in
Delayed payment mode.
2013-12-01 20:13:52 +01:00
Laurent Destailleur
820cdde97b Fix: Currency is not visible 2013-12-01 20:13:45 +01:00
Laurent Destailleur
ad9e7b8593 Fix: [ bug #1075 ] POS module doesn't decrement stock of products in
Delayed payment mode.
2013-12-01 20:12:47 +01:00
Laurent Destailleur
9f251a7838 Fix: Currency is not visible 2013-12-01 19:59:01 +01:00
Laurent Destailleur
0b9e8d6832 Fix: Alignement 2013-12-01 19:41:41 +01:00
Laurent Destailleur
30428ec6e5 Fix: Control on minimum amount must be one only on standard and
replacement invoices.

Conflicts:
	htdocs/compta/facture.php
2013-12-01 19:41:29 +01:00
Laurent Destailleur
a6e4ba7001 Fix: No limits for drafts lists 2013-12-01 19:40:36 +01:00
Laurent Destailleur
e9e94b9e47 Fix: Alignement 2013-12-01 19:39:21 +01:00
Laurent Destailleur
27c6b30651 Fix: Control on minimum amount must be one only on standard and
replacement invoices.
2013-12-01 18:56:20 +01:00
Laurent Destailleur
6e96d60c6c Fix: No limits for drafts lists 2013-12-01 18:53:16 +01:00
Laurent Destailleur
bfd229d484 Fix: [ bug #1079 ] External users can't access projects even if it is a
contact.
2013-12-01 18:14:19 +01:00
Laurent Destailleur
f207aabe7a Fix: When editing thirdparty, result is not refreshed 2013-12-01 18:13:57 +01:00
Laurent Destailleur
fdc1209986 Fix: [ bug #1163 ] SQL Error when searching for supplier orders
Conflicts:
	ChangeLog
2013-12-01 18:12:15 +01:00
Laurent Destailleur
eaa6d987b6 Fix: When database is not synchronized with dir, we clean database. 2013-12-01 17:32:05 +01:00
Laurent Destailleur
84e3457023 Fix: [ bug #1161 ] Search on product label 2013-12-01 16:30:35 +01:00
Laurent Destailleur
8f1a553395 Fix: [ bug #1162 ] Traduction des mi-journées 2013-12-01 16:22:06 +01:00
Laurent Destailleur
395066519b Fix: [ bug #1163 ] SQL Error when searching for supplier orders 2013-12-01 16:18:18 +01: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
Laurent Destailleur
d39ed05c5d Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
	htdocs/comm/propal/list.php
2013-12-01 16:05:09 +01:00
Laurent Destailleur
8d1e10cd76 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-12-01 16:02:19 +01:00
Laurent Destailleur
cbf1ddaa17 Fix: [ bug #1079 ] External users can't access projects even if it is a
contact.
2013-12-01 16:01:33 +01:00
Laurent Destailleur
833fb1a126 Fix: When editing thirdparty, result is not refreshed 2013-12-01 15:46:15 +01:00
Laurent Destailleur
25f49b6a24 Fix: bad test 2013-12-01 15:29:07 +01:00