Commit Graph

6306 Commits

Author SHA1 Message Date
Laurent Destailleur
b06cc18568 Fix sort on amount 2016-08-30 11:53:42 +02:00
Laurent Destailleur
216f7dbaee Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-30 00:21:56 +02:00
Laurent Destailleur
d7007bd16b Fix lang not loaded 2016-08-30 00:21:26 +02:00
Laurent Destailleur
ff0b424f74 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-29 18:18:35 +02:00
Laurent Destailleur
6b7d509e44 Fix css 2016-08-29 18:12:53 +02:00
Laurent Destailleur
b43bd371fd Merge pull request #5666 from aspangaro/4.0-p45
Fix: Wrong language key
2016-08-29 17:47:49 +02:00
Laurent Destailleur
9c1ba67169 Fix css 2016-08-29 16:40:51 +02:00
aspangaro
7cb4f85f6b Fix: Wrong language key 2016-08-29 07:30:39 +02:00
Laurent Destailleur
4215ec3ca9 FIX usage of sepa generation setup. 2016-08-28 20:12:25 +02:00
Laurent Destailleur
317132fea4 CSS 2016-08-22 12:25:54 +02:00
Laurent Destailleur
f06545a3fe Fix cancel button ignored 2016-08-19 17:22:53 +02:00
Laurent Destailleur
83107746ad Fix no way to fix the ref of recurring invoice when an error was done
into typing.
2016-08-19 16:18:39 +02:00
Laurent Destailleur
88afc4ad5a Merge pull request #5625 from aspangaro/4.0-p42
Uniformize presentation, add button cancel everywhere
2016-08-17 16:11:59 +02:00
Laurent Destailleur
47489265b1 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-17 11:15:30 +02:00
aspangaro
b7420372b7 Uniformize presentation, add button cancel everywhere 2016-08-12 22:53:30 +02:00
Juanjo Menent
adc0a73e93 Merge pull request #5603 from atm-florian/4.0_FIX_Multicurrency_with_french_number_setting
FIX : MULTICURRENCY if value is 1,56 then GETPOST 'int' check return ''
2016-08-11 20:42:25 +02:00
Laurent Destailleur
86c90ade3f Another fix on bank account missing when bank module enabled. 2016-08-11 18:41:31 +02:00
Laurent Destailleur
4df9af1ba0 Fix several errors with bank account module enabled on sale tax edition 2016-08-11 18:18:03 +02:00
Laurent Destailleur
f674b24945 Fix look and feel 2016-08-11 17:23:42 +02:00
florian HENRY
5bb3b5c074 FIX : MULTICURRENCY if value is 1,56 then GETPOST 'int' check return '' 2016-08-10 09:47:25 +02:00
aspangaro
43ffb061ef FIX : Accountancy - BANK_DISABLE_DIRECT_INPUT Add an option 2016-08-10 08:07:27 +02:00
Laurent Destailleur
782ab6a02b Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
	htdocs/core/modules/barcode/modules_barcode.class.php
	htdocs/product/admin/product.php
2016-08-05 00:42:40 +02:00
Laurent Destailleur
86f576f8d3 Fix strict sql 2016-08-02 13:45:35 +02:00
Laurent Destailleur
dfc38351ef Fix $i not initialized 2016-08-01 19:48:39 +02:00
Laurent Destailleur
bb99209b5e Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-01 15:06:22 +02:00
Laurent Destailleur
621a7d93fa Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-08-01 15:05:57 +02:00
Laurent Destailleur
97dd1f4bbb Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/filefunc.inc.php
2016-08-01 15:03:59 +02:00
BENKE Charlie
9a0494bd64 Update bonprelevement.class.php 2016-08-01 14:11:58 +02:00
aspangaro
8ce5fcd980 Uniformize presentation salary payment 2016-08-01 07:40:05 +02:00
aspangaro
4a0eb496fa Merge remote-tracking branch 'Upstream/4.0' into 4.0-p36
Conflicts:
	htdocs/societe/rib.php
2016-08-01 07:27:49 +02:00
aspangaro
3cdb2d45c2 Uniformize presentation customer invoice 2016-08-01 07:10:42 +02:00
Laurent Destailleur
33495847b7 Merge branch '4.0-p36' of https://github.com/aspangaro/dolibarr into
aspangaro-4.0-p36

Conflicts:
	htdocs/societe/rib.php
2016-07-31 03:05:34 +02:00
Laurent Destailleur
e5583f1544 Fix bad translation. Confusionbetween internal tranfert and bank
tranfert for payements
2016-07-30 17:28:18 +02:00
Laurent Destailleur
857de64607 Fix multicurrency 2016-07-30 16:41:10 +02:00
Laurent Destailleur
5b4c215526 Fix size of field too small and bad translation 2016-07-30 10:31:56 +02:00
aspangaro
3c3df0c4f6 Fix Presentation 2016-07-29 23:52:49 +02:00
Laurent Destailleur
69247afd06 FIX #4447 2016-07-29 17:26:24 +02:00
Laurent Destailleur
b85bb8c0f8 Merge remote-tracking branch 'origin/3.9' into 4.0
Conflicts:
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2016-07-29 16:24:02 +02:00
Laurent Destailleur
80ac99e9b1 Fix missing field into response 2016-07-28 23:50:17 +02:00
Ferran Marcet
5bc51a3439 FIX: Can't create withdrawal document 2016-07-28 16:56:23 +02:00
Laurent Destailleur
fb8f0ed657 FIX #5503 2016-07-27 20:05:22 +02:00
Laurent Destailleur
e0f5a3cfe9 Fix send email in mass action 2016-07-25 21:51:29 +02:00
Regis Houssin
d8f77abf31 Fix: missing sourcetype can create fault positive 2016-07-25 14:36:20 +02:00
Laurent Destailleur
5bbd8eded9 Code comment 2016-07-22 18:32:45 +02:00
Laurent Destailleur
774e327831 Merge remote-tracking branch 'origin/3.9' into 4.0
Conflicts:
	htdocs/comm/remx.php
	htdocs/compta/facture.php
	htdocs/langs/en_US/companies.lang
2016-07-21 10:30:51 +02:00
florian HENRY
5ea72c8d56 FIX : cannot update bank account on invoice if module order not
activated
2016-07-19 07:46:27 +02:00
Laurent Destailleur
621a29d0e0 Fix account may contains text 2016-07-18 12:01:25 +02:00
Juanjo Menent
e5235be7d0 Merge pull request #5500 from atm-florian/4.0_fix_updateline_multicurrency
FIX : class FactureLine fetch() and update() crash
2016-07-18 08:56:15 +02:00
florian HENRY
d3344f5291 sd 2016-07-18 07:48:32 +02:00
florian HENRY
bc4674bdce fix problem with call update method after fetch on invocie lines 2016-07-18 07:37:18 +02:00