Laurent Destailleur
ddd101757e
FIX Bulk pdf merge on supplier proposals
2017-04-09 13:26:26 +02:00
Laurent Destailleur
52c86cb3f5
NEW Bulk actions available on supplier orders
2017-04-09 13:12:25 +02:00
Juanjo Menent
e4ed626912
Fix: Travis error
2017-04-09 12:50:09 +02:00
BENKE Charlie
a0a9c8fa0c
Update invoice.lib.php
2017-04-09 11:33:56 +02:00
BENKE Charlie
54780ff205
Update fiche-rec.php
2017-04-09 11:33:09 +02:00
BENKE Charlie
feebd4252a
add invoice_rec_prepare_head for reccuring invoice
2017-04-09 11:29:54 +02:00
vvnt
ff75077b34
Fix: bug #6653 situation invoice miscalculation
...
Bug (#6653 )
In price.lib.php (htdocs\core\lib\price.lib.php), the function calcul_price_total() is defined (line 76). The 7th parameter is **$remise_percent_global**.
However, this function is called on facture.class.php (htdocs\compta\facture\class\facture.class.php) and the 7th parameter used is **$line->product_type**. Consequently, invoice situation is correct when user sells a product (product_type = 0) and is wrong when user sells a service (product_type = 1).
Effectively, in the latter case, the total situation invoice will be wrong by 1%.
In order to correct this, we can add 0 as the 7th parameter and move **$line->product_type** to the 10th parameter.
2017-04-08 20:15:14 +02:00
Laurent Destailleur
bb7c164752
Work on page to set/edit default values
2017-04-08 14:18:10 +02:00
Laurent Destailleur
76af83ce06
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-04-08 14:06:25 +02:00
Laurent Destailleur
56a4b7a1fd
Work on v6 look and feel
2017-04-08 14:03:38 +02:00
Laurent Destailleur
7f7ba6279a
Fix translation
2017-04-08 14:02:07 +02:00
Laurent Destailleur
31f580ad93
FIX Enter a direct bank transaction
2017-04-08 01:25:52 +02:00
Laurent Destailleur
669a04e304
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-04-07 18:39:10 +02:00
Laurent Destailleur
a0e75d0af0
Work on look and feel v6
2017-04-07 18:38:55 +02:00
Laurent Destailleur
1ab3086fca
Work on website module
2017-04-07 16:44:43 +02:00
Laurent Destailleur
be439f6252
Work on look and feel v6
2017-04-07 16:16:44 +02:00
florian HENRY
e76a00845d
better test
2017-04-07 14:55:59 +02:00
florian HENRY
a1c1aa054f
new : select2 for contract selector
2017-04-07 14:55:14 +02:00
philippe grand
3715fcdd5f
Update code using new css class
2017-04-07 14:25:33 +02:00
altatof
d892a89f45
FIX: dont get empty "Incoterms : - " string if no incoterm
2017-04-07 14:15:51 +02:00
dolibarr95
8154521a22
Fix typo
...
Fix typo error in trigger name.
2017-04-07 14:15:36 +02:00
Laurent Destailleur
60a54041c2
NEW Enable bulk actions delete on supplier invoices
2017-04-07 14:09:19 +02:00
philippe grand
d3719a01a2
Update code using new css class
2017-04-07 13:56:41 +02:00
Laurent Destailleur
aa47575b13
Serious debug of variant module. No more fu.. js errors on smarpthone.
2017-04-07 12:31:08 +02:00
altatof
919633b2be
escape supplier ref
2017-04-07 12:10:01 +02:00
altatof
a6ec22d7fe
FIX: dont lose supplier ref if no supplier price in database
2017-04-07 12:06:15 +02:00
Laurent Destailleur
5ab8704aee
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-04-07 11:03:44 +02:00
Laurent Destailleur
ea44e14b60
Start debug the variant module
2017-04-07 11:01:12 +02:00
florian HENRY
7668702806
fix: missing attribute update
2017-04-07 08:56:10 +02:00
Laurent Destailleur
248150dd41
Merge pull request #6639 from WideeFr/patch-1
...
FIX Avoid (DEPOSIT) (1) & (2) descriptions
2017-04-06 23:33:03 +02:00
Laurent Destailleur
12375be14a
Merge pull request #6593 from dolibarr95/patch-5
...
NEW : Create a trigger for company rib update
2017-04-06 23:29:06 +02:00
Laurent Destailleur
216bce608d
Work on v6 look and feel
2017-04-06 23:28:06 +02:00
Laurent Destailleur
915a74a85f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-04-06 22:32:05 +02:00
Laurent Destailleur
a99a4be9e0
Work on 6.0 look and feel
2017-04-06 22:31:45 +02:00
Laurent Destailleur
07bbf1a32b
Merge pull request #6648 from delcroip/patch-9
...
NEW : show files in the bank statement + download
2017-04-06 22:31:19 +02:00
Laurent Destailleur
87368908f6
Merge pull request #6646 from laudeco/feature/expense_report_paid
...
NEW mark expense report as paid if payement set the remaining sold to 0
2017-04-06 22:01:28 +02:00
Laurent Destailleur
a61543dedc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-04-06 21:59:41 +02:00
Laurent Destailleur
f598bf8bef
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-04-06 21:59:11 +02:00
Laurent Destailleur
8363bee234
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/filefunc.inc.php
2017-04-06 21:56:48 +02:00
Laurent Destailleur
fe4f71296f
FIX #6636 Complete fix
2017-04-06 21:55:23 +02:00
Laurent Destailleur
e2ea5945dd
Work on look and feel v6
2017-04-06 21:48:28 +02:00
Laurent Destailleur
5d099d24ee
Merge pull request #6636 from defrance/patch-3
...
FIX : Categories Bank vs categories transactions
2017-04-06 21:48:14 +02:00
Laurent Destailleur
8cb28b7bfa
Merge pull request #6638 from delcroip/patch-7
...
FIX: Supplier is not the project customer
2017-04-06 21:24:01 +02:00
Laurent Destailleur
44302f1aea
Merge pull request #6650 from atm-arnaud/FIX_total_line_on_list_facture
...
Fix total line on list facture
2017-04-06 21:11:32 +02:00
arnaud
6b2d8a3c34
FIX limit+1 dosn't show Total line
2017-04-06 11:14:15 +02:00
Laurent Destailleur
18fc5bec9b
Better log
2017-04-06 10:56:37 +02:00
delcroix Patrick
337eac30c1
Update releve.php
2017-04-05 21:14:41 +02:00
delcroix Patrick
ca72e5e19f
NEW : download button
2017-04-05 20:53:41 +02:00
delcroix Patrick
dae0828543
NEW : show files in the bank statement + download
2017-04-05 20:50:18 +02:00
De Coninck Laurent
ae2e40e5e7
mark expense report as paid if payement set the remaining sold to 0
2017-04-05 19:06:21 +02:00
