lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
59,869 Commits 43 Branches 150 Tags 886 MiB
69b26dcb4e
Commit Graph

59869 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mikee2
c82ee862af Merge pull request #1 from mikee2/mikee2-odtphp-patch-1 
Update Segment.php
 2017-04-09 21:59:20 +02:00
mikee2
f460d2e705 Update Segment.php 2017-04-09 21:39:15 +02:00
Marcos García de La Fuente
996b5e9f87 Corrected translation errors and little bug showing a non-available button to a restricted user 2017-04-09 18:17:46 +02:00
Marcos García de La Fuente
12df7b6ab9 FIX #6679 User with restricted supplier invoice permissions can edit project, payment conditions, payment mode 
Close #6679
 2017-04-09 18:09:08 +02:00
Marcos García de La Fuente
59fa5c2fe6 FIX #6680 User with restricted supplier invoice permissions sees "reopen" button even if he has no permission to do it 
Close #6680
 2017-04-09 17:38:59 +02:00
Marcos García de La Fuente
2057613ad9 FIX #6675 Restricted user with no agenda permissions can see a button to create appointment in thirdparty contact list 
Close #6675
 2017-04-09 15:18:02 +02:00
Marcos García de La Fuente
2d83efc7e3 FIX #6673 Missing "nature" table header in thirdparty list 
Close #6673
 2017-04-09 15:03:02 +02:00
Laurent Destailleur
b054ca8267 NEW Introduce mass action on product list ('delete' for the moment) 2017-04-09 15:02:55 +02:00
Marcos García de La Fuente
da0af36086 FIX #6671 Cannot remove thirdparty type with "#" in its name 
Close #6671
 2017-04-09 14:51:15 +02:00
Laurent Destailleur
0a47245ba5 NEW Add mass actions (pdf merge and delete) for interventions 2017-04-09 14:31:56 +02:00
Marcos García de La Fuente
411d276ed2 FIX #6669 User with no permission to edit customer invoices can see a edit button in project entry 
Close #6669
 2017-04-09 14:29:40 +02:00
Marcos García de La Fuente
a8da077613 FIX #6613 Default subject for Supplier proposal emails is filled with a non-existing key 
Close #6613
 2017-04-09 14:13:04 +02:00
Marcos García de La Fuente
74f0ae5bbb FIX #6623 User card shows "Return to list" link even if the user has no rights to list users 
Close #6623
 2017-04-09 14:09:33 +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
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