Commit Graph

54854 Commits

Author SHA1 Message Date
Juanjo Menent
0907465fcf Merge pull request #5615 from aspangaro/4.0-p41
Fix: Accountancy - Problem to define account_parent for an accounting account + presentation
2016-08-11 20:46:08 +02:00
Juanjo Menent
3b509db141 Merge pull request #5604 from atm-florian/FIX_createpropalfromproject
FIX : create proposal from project
2016-08-11 20:43:44 +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
Juanjo Menent
5ac175b7e4 Merge pull request #5602 from aspangaro/4.0-p38
FIX : Accountancy - BANK_DISABLE_DIRECT_INPUT Add an option
2016-08-11 20:40:10 +02:00
aspangaro
300da71b9c Replace with 0 2016-08-11 06:12:04 +02:00
aspangaro
55a83f9d8d Fix: Accountancy - Problem to define account_parent for an accounting account & presentation 2016-08-11 06:08:33 +02:00
florian HENRY
cd8585da63 fix for finche inter same problem 2016-08-10 11:54:49 +02:00
florian HENRY
d38ff5c246 FIX : create proposal from project 2016-08-10 11:34:10 +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
8c63d68083 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-09 17:28:16 +02:00
Laurent Destailleur
a2f1291f94 Fix missing supplier proposals in project overview 2016-08-09 17:28:02 +02:00
Laurent Destailleur
82b14e30d7 Merge pull request #5596 from atm-florian/40_accountancy
40 accountancy
2016-08-09 13:34:46 +02:00
Laurent Destailleur
29fdebe0d9 Fix list of lot 2016-08-09 13:21:30 +02:00
Laurent Destailleur
7b6755cfcd Fix several errors in search an sorting in stock by lot view 2016-08-09 13:14:33 +02:00
Laurent Destailleur
2262c1c7dd Fix code generator 2016-08-08 21:58:47 +02:00
Laurent Destailleur
54b47d7f4f Fix edit of page in module website
Conflicts:
	htdocs/websites/class/website.class.php
2016-08-08 19:09:37 +02:00
Laurent Destailleur
fb3f6972eb Work on module website
Conflicts:
	htdocs/websites/index.php
2016-08-08 18:29:24 +02:00
florian HENRY
beadb19fea fix list 2016-08-08 15:31:06 +02:00
florian HENRY
95a66e7e63 Work on accoutancy PgSQL comptatiblity and other stuff 2016-08-08 14:52:19 +02:00
Laurent Destailleur
4cf01bc685 Fix code comment 2016-08-05 04:48:30 +02:00
Laurent Destailleur
e1e8254bcf Fix thumbs are using same extension than original. 2016-08-05 04:31:19 +02:00
Laurent Destailleur
1b10e27618 Fix bad link 2016-08-05 04:20:38 +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
40723b264a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-05 00:37:10 +02:00
Laurent Destailleur
c2e81b6edb Fix colspan 2016-08-05 00:36:58 +02:00
Laurent Destailleur
112b945e6b Merge pull request #5583 from atm-florian/3.9
FIX : update limit stock on product stock
2016-08-05 00:34:32 +02:00
Laurent Destailleur
5555037346 Merge pull request #5580 from simnandez/4.0
NEW Add Panama datas
2016-08-05 00:34:05 +02:00
Laurent Destailleur
bdf779dfd2 Merge pull request #5578 from aspangaro/4.0-p37
Uniformize presentation
2016-08-05 00:32:49 +02:00
Laurent Destailleur
16c7d51abc Merge pull request #5576 from atm-florian/3.9_fixPHPStrict
FIX php Strict
2016-08-05 00:26:47 +02:00
Juanjo Menent
48fe3524d5 Fix #5582 Can't add or change customer ref on proposal 2016-08-04 17:34:53 +02:00
Juanjo Menent
d76c57fed9 Merge remote-tracking branch 'upstream/4.0' into 4.0 2016-08-04 17:05:18 +02:00
Laurent Destailleur
81fc86ba06 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-04 12:10:40 +02:00
Laurent Destailleur
5247faf50f Fix align 2016-08-04 10:48:19 +02:00
Laurent Destailleur
e0b9496f9e Fix link sometimes fails because of id not defined 2016-08-04 10:44:17 +02:00
Laurent Destailleur
182338beb1 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-04 10:27:50 +02:00
Laurent Destailleur
11ab49d85d Fix bad help 2016-08-04 10:27:19 +02:00
Laurent Destailleur
af150c35fc Fix no picto on setup pages 2016-08-04 10:19:30 +02:00
Laurent Destailleur
caa987fb61 Clean obsolete comment 2016-08-04 10:13:27 +02:00
Laurent Destailleur
f14ef7b50f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-04 10:12:34 +02:00
Laurent Destailleur
da84fac390 Fix: data were lost if creation failed 2016-08-04 10:08:58 +02:00
Laurent Destailleur
7c97bf900f Neutral colors 2016-08-03 20:52:50 +02:00
florian HENRY
5f415478ac FIX : update limit stock on product stock 2016-08-03 17:29:04 +02:00
Juanjo Menent
51a4f9e5d7 Merge pull request #5575 from aspangaro/4.0-p36
Fix Expense report | if VAT disable in Dolibarr, traduction of code_libelle & presentation
2016-08-03 10:30:40 +02:00
Juanjo Menent
597f5dae15 Merge pull request #5551 from marcosgdf/bug-5549
FIX #5549 getNomUrl tooltips show Order info even if user has no rights to read them
2016-08-03 10:27:44 +02:00
Juanjo Menent
28efc3e50f NEW Add Panama datas 2016-08-03 09:45:12 +02:00
aspangaro
27603b966e Uniformize presentation on supplier order 2016-08-03 08:25:35 +02:00
aspangaro
21e753d510 Uniformize presentation on intervention 2016-08-03 08:00:30 +02:00
aspangaro
da274f0ca4 Uniformize presentation on contract 2016-08-03 07:28:00 +02:00
Laurent Destailleur
abbe204c97 Fix design of option PROJECT_ADD_SUBTOTAL_LINES 2016-08-03 01:42:05 +02:00