Commit Graph

39741 Commits

Author SHA1 Message Date
Laurent Destailleur
579e7f8e63 Sync from transifex 2013-12-09 09:26:48 +01:00
Laurent Destailleur
d34d1aed2e Fix: checkstyle 2013-12-09 02:21:21 +01:00
Laurent Destailleur
95a41ca2fd Merge pull request #1343 from marcosgdf/missing-translations
Added missing translations for permissions of margins module
2013-12-08 17:01:38 -08:00
Laurent Destailleur
f36354234d Merge pull request #1339 from daamien/patch-1
bug #1179
2013-12-08 16:48:52 -08:00
Marcos García de La Fuente
02036af782 Added missing translations for permissions of margins module 2013-12-08 21:18:01 +02:00
Laurent Destailleur
b0e18348d9 Fix: Test must never be done on a translated string 2013-12-08 16:39:47 +01:00
Laurent Destailleur
3c0c9019b5 Comment 2013-12-08 15:40:22 +01:00
Laurent Destailleur
9b779e8ed8 Update ignore file 2013-12-08 15:09:35 +01:00
Laurent Destailleur
4d44f93c98 Remove <<<< 2013-12-08 12:01:59 +01:00
Laurent Destailleur
a90f6ef368 Fix: Error management with corrupted module files 2013-12-08 02:32:04 +01:00
damien clochard
c36ba2a8ea bug #1179
if there's a delivery date (date_livraison) then use it instead of the validation date (date_valid) to check if we need to display a warning or not...

For example, if we are in Septembre and there's an order that was validated in june but its delivery date is set to november then a warning is not necessary, since there's nothing to do but wait for the order to be delivered.
2013-12-06 13:08:30 +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
202c6b728e Fix: Useless css styles make jmobile wrong 2013-12-03 20:53:39 +01:00
Laurent Destailleur
01c91c7194 Fix: Missing translation and missing comments 2013-12-03 20:44:31 +01:00
Laurent Destailleur
97e6acccde Merge pull request #1336 from atm-alexis/develop
Error on mercure bill's number function.
2013-12-03 09:02:47 -08: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
Laurent Destailleur
f45a31969b Fix regression 2013-12-02 05:52:41 +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
Laurent Destailleur
f7d855f4ce Fix: [ bug #1171 ] Documents lost in interventions after validating 2013-12-01 21:03:12 +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
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
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
Laurent Destailleur
f86cf6c440 Check parameters of script 2013-12-01 15:22:47 +01:00
Laurent Destailleur
71a85464d5 Check parameters of script 2013-12-01 15:22:29 +01:00
Laurent Destailleur
a7c246cec1 Check parameters of script 2013-12-01 15:21:58 +01:00
Laurent Destailleur
8e51a4683f Check parameters of script 2013-12-01 15:20:57 +01:00
Laurent Destailleur
519919889c Fix comment 2013-11-30 16:57:11 +01:00
Laurent Destailleur
e0dd3090c9 Remove hardcoded strings 2013-11-30 10:58:43 +01:00
Laurent Destailleur
abec634960 Look: Better support for jmobile 2013-11-30 02:31:17 +01:00
Laurent Destailleur
3f89f27a0c Merge pull request #1329 from GPCsolutions/vagrant
Vagrant
2013-11-29 06:38:48 -08:00
Raphaël Doursenaud
b391de1b23 Added initdata info to vagrant readme 2013-11-29 15:27:04 +01:00
Raphaël Doursenaud
507e648adb Use latest release initdata 2013-11-29 15:24:29 +01:00
Raphaël Doursenaud
0f34f81dc7 Moved VM vhost to dev.dolibarr.org
This helps avoid Google Chrome doing a search instead of an HTTP request
2013-11-29 15:22:31 +01:00
Raphaël Doursenaud
cb210650de Added more information about the dolibarrdev vagrant box 2013-11-29 15:22:30 +01:00
Raphaël Doursenaud
694eeeb2bb Fixed vagrant shared folder permissions 2013-11-29 15:22:30 +01:00
Raphaël Doursenaud
9bba60ebee Added basic readme about Vagrant 2013-11-29 15:22:30 +01:00
Raphaël Doursenaud
37031410f9 Ignore vagrant generated files 2013-11-29 15:22:30 +01:00
Raphaël Doursenaud
0f9c616890 Added vagrant development box 2013-11-29 15:22:30 +01:00
Laurent Destailleur
e4860679de Merge pull request #1327 from FHenry/3.4
[ bug #1159 ] Commercial search "other" give p.note do not exists
2013-11-29 03:18:13 -08:00
Cédric Salvador
22d31817de made getVATRates synchronous to avoid concurrency problems 2013-11-29 12:13:23 +01:00
Laurent Destailleur
e27d109f2d Merge pull request #1328 from csalvador/develop-fixAJAX
Develop fix ajax
2013-11-29 02:59:11 -08:00
Laurent Destailleur
b3ff58e864 Merge pull request #1330 from grandoc/3.5
fix management of all errors message
2013-11-29 02:58:21 -08:00