Josep Lluís
deb309ab7e
NEW Show local taxes in facture list
...
Show localtax1 and localtax2 in facture list, only if they are enabled in company config
2017-04-13 08:30:48 +02:00
Laurent Destailleur
d74baea1d3
Fix error management on direct print
2017-04-12 13:01:41 +02:00
Laurent Destailleur
77dfb05647
Work on v6 look and feel
2017-04-12 12:35:13 +02:00
Laurent Destailleur
d78f3923ee
Support of preview for pdf with several pages
2017-04-12 12:13:38 +02:00
Laurent Destailleur
26a9999fbf
Support of preview for pdf with several pages
2017-04-12 11:38:55 +02:00
Laurent Destailleur
4eaa1d4f46
Add nb of generation into list of template invoices
2017-04-11 20:07:35 +02:00
Laurent Destailleur
423ffefbf3
NEW Add hidden option THIRDPARTY_INCLUDE_PARENT_IN_LINKTO
2017-04-11 18:18:36 +02:00
Laurent Destailleur
e68ad408af
Merge pull request #6687 from defrance/patch-5
...
expedition->dir_output is used by livraison
2017-04-11 11:32:16 +02:00
Laurent Destailleur
0417eb3862
Merge pull request #6686 from guillaume-uH57J9/develop
...
NEW Improve public member subscription form with member type
2017-04-11 11:31:25 +02:00
Laurent Destailleur
e08b92d913
Merge pull request #6665 from defrance/patch-4
...
Add invoice_rec_prepare_head for reccuring invoice
2017-04-11 11:13:12 +02:00
Laurent Destailleur
550687e084
Merge pull request #6666 from simnandez/develop
...
Fix: Travis error
2017-04-11 11:12:29 +02:00
Laurent Destailleur
b2b1dcc574
Merge pull request #6663 from vvnt/patch-2
...
FIX: situation invoice miscalculation (#6653 )
2017-04-11 11:11:29 +02:00
Laurent Destailleur
81020cea77
Merge pull request #6660 from atm-florian/dev_contractselect
...
NEW select2 for contract selector
2017-04-11 11:08:59 +02:00
Laurent Destailleur
9447b2a38b
Merge pull request #6658 from dolibarr95/patch-10
...
Fix typo
2017-04-11 11:07:24 +02:00
Laurent Destailleur
5cbad450f3
git push origin developMerge branch 'grandoc-develop' into develop
2017-04-11 11:06:38 +02:00
Laurent Destailleur
3907c30ee3
Merge branch 'develop' of https://github.com/grandoc/dolibarr into
...
grandoc-develop
Conflicts:
dev/skeletons/skeleton_list.php
2017-04-11 11:06:26 +02:00
Laurent Destailleur
6aa56ce0fa
NEW Add a tracking id into mass emailing
...
Prepare code to use a dedicated SMTP server according to context.
2017-04-11 10:57:17 +02:00
Laurent Destailleur
0de77fa460
Fix look and feel v6
2017-04-11 09:55:45 +02:00
Laurent Destailleur
3749a7a1d1
New look
2017-04-11 02:51:44 +02:00
Laurent Destailleur
759315aef5
NEW Mass action delete available on project and tasks
2017-04-11 02:48:16 +02:00
Laurent Destailleur
37939e7cbd
NEW Add key __USERID__ and __ENTITYID__ as key for dynamic filters.
2017-04-11 02:17:47 +02:00
Laurent Destailleur
d15792bdf4
Minor fix
2017-04-11 00:59:47 +02:00
Laurent Destailleur
9b45776941
Fix responsive
2017-04-10 17:25:53 +02:00
BENKE Charlie
20202871eb
expedition->dir_output is used by livraison
...
not livraison->dir_output who not exist
2017-04-10 15:54:02 +02:00
Laurent Destailleur
06f9c1989b
Work on default values
2017-04-10 13:14:31 +02:00
Laurent Destailleur
f1ae0eb7c6
Default value
2017-04-10 12:51:52 +02:00
Guillaume
f427c8441a
add translation strings for ForceMemberType
2017-04-09 22:49:48 +02:00
guillaume-uH57J9
e335b757fd
Add UI to configure MEMBER_NEWFORM_FORCETYPE
...
Use tertiary operator ($var?: -1) instead of (!empty($var) ? $var : -1)
2017-04-09 22:37:17 +02:00
guillaume-uH57J9
199067e4b8
members/new.php : non-public by default
...
in the form, disable public by default, to be consistent with class Adherent's default value
2017-04-09 22:00:19 +02:00
Laurent Destailleur
b054ca8267
NEW Introduce mass action on product list ('delete' for the moment)
2017-04-09 15:02:55 +02:00
Laurent Destailleur
0a47245ba5
NEW Add mass actions (pdf merge and delete) for interventions
2017-04-09 14:31:56 +02:00
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
