Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 00:53:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,784 Commits 37 Branches 191 Tags
764a928cd6f1b51b800039a30aef82b3ff513b40
Commit Graph

63615 Commits

Author SHA1 Message Date
Frédéric FRANCE
764a928cd6 wip 2019-01-27 23:48:36 +01:00
Laurent Destailleur
f30a3d59ba Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Laurent Destailleur
d1befcb1ba Merge pull request #10427 from EuskalMoneta/develop 
NEW Get the list of groups of a user with the REST API.
 2019-01-27 17:58:09 +01:00
Laurent Destailleur
a268a13c89 Merge pull request #10423 from grandoc/new_branch_27_01_2019 
fix translations
 2019-01-27 17:55:05 +01:00
Laurent Destailleur
4f9f0fd7b5 Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Laurent Destailleur
0738e0e7cc Merge pull request #10420 from andreubisquerra/master 
Remove absolute divs and add Dolistore POS category link to TakePOS
 2019-01-27 17:52:34 +01:00
Laurent Destailleur
d4daa6cebd Merge pull request #10430 from frederic34/patch-18 
typo in fournisseur.product.class.php
 2019-01-27 17:51:49 +01:00
Philippe GRAND
b8ec33d29b fix translations 2019-01-27 17:28:18 +01:00
Frédéric FRANCE
f0cdf300d1 Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
0e3efadf59 typo in fournisseur.product.class.php 2019-01-27 14:37:37 +01:00
Frédéric FRANCE
496fa9b0fb PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Xebax
0aa98297f5 NEW Get the list of groups of a user with the REST API. 2019-01-27 13:52:08 +01:00
Philippe GRAND
95bbb46fdf fix translations 2019-01-27 12:20:24 +01:00
Philippe GRAND
a6c40dc867 fix translations 2019-01-27 11:37:57 +01:00
Frédéric FRANCE
6e91b3cefc PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
andreubisquerra
bec25fb45c Remove absolut divs and add Dolistore POS category link to TakePOS 2019-01-27 01:28:32 +01:00
Laurent Destailleur
a9da6a2d51 Merge pull request #10410 from ptibogxiv/patch-107 
NEW manage statut member type
 2019-01-26 15:44:40 +01:00
Laurent Destailleur
462c1f9c1a Merge pull request #10413 from mapiolca/patch-8 
Add date_livraison substitution
 2019-01-26 15:38:00 +01:00
Laurent Destailleur
cc574852d2 Fix phpcs 2019-01-26 15:20:36 +01:00
Pierre Ardoin
6fdbded588 Update functions.lib.php 2019-01-26 14:40:00 +01:00
Laurent Destailleur
e46fb303d0 Merge pull request #10386 from atm-florian/dev_newhiglightinvoice_onpayment 
NEW show in blod invoice amount where we came from when making payment
 2019-01-26 14:29:20 +01:00
Laurent Destailleur
fd192f10c4 Merge pull request #10341 from hregis/8.0_bug 
FIX security broken with Multicompany
 2019-01-26 14:28:13 +01:00
Laurent Destailleur
b4400b95db Merge pull request #10411 from BitKFu/develop 
Added new calculation fields for the doc generator
 2019-01-26 14:17:43 +01:00
Laurent Destailleur
c989b8d102 Update commondocgenerator.class.php 2019-01-26 14:17:01 +01:00
Laurent Destailleur
ab262237b2 Merge pull request #10393 from fappels/10_add_product_dimensions 
NEW Show product dimensions in product list tooltip.
 2019-01-26 14:14:03 +01:00
Laurent Destailleur
f96d730943 Merge pull request #10391 from grandoc/new_branch_22_01_2019 
update with html5 compliant code
 2019-01-26 14:09:15 +01:00
Laurent Destailleur
60c9eccbc4 Merge pull request #10395 from fappels/10_work_on_supplier_price_history 
Work on #10394 supplier price history
 2019-01-26 14:08:15 +01:00
Laurent Destailleur
4a5d260db5 Update fournisseur.product.class.php 2019-01-26 14:07:37 +01:00
Laurent Destailleur
adb7ec7015 Merge pull request #10399 from grandoc/new_branch_23_01_2019 
update with html5 compliant code
 2019-01-26 14:02:26 +01:00
Laurent Destailleur
999f84458f Merge pull request #10415 from grandoc/new_branch_25_01_2019 
fix : The condition  == 3 is always false
 2019-01-26 14:01:35 +01:00
Laurent Destailleur
d3decebd83 Merge pull request #10418 from grandoc/new_branch_26_01_2019 
fix : bad type cast
 2019-01-26 14:00:59 +01:00
Laurent Destailleur
f313791e57 Merge pull request #10400 from andreubisquerra/master 
Bills and coins pad, or Num pad in TakePOS
 2019-01-26 13:55:45 +01:00
Laurent Destailleur
6b4b03e6aa Merge pull request #10405 from grandoc/new_branch_24_01_2019 
update with html5 compliant code
 2019-01-26 13:52:10 +01:00
Laurent Destailleur
a10203bfad Merge pull request #10378 from rycks/exportJournaux 
Export journaux
 2019-01-26 13:51:41 +01:00
Philippe Grand
a1b90638d4 Update card.php 
fix
 2019-01-26 09:10:16 +01:00
Philippe GRAND
b1ea5af876 fix : bad type cast 2019-01-26 09:02:49 +01:00
Laurent Destailleur
cfa850cd20 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-26 01:32:00 +01:00
Laurent Destailleur
3f75bb694c Fix phpcs 2019-01-26 01:31:22 +01:00
Laurent Destailleur
70c52e6417 Add field calling_duration in table llx_actioncomm 2019-01-26 01:17:41 +01:00
Philippe GRAND
133e6f3de0 useless code 2019-01-25 16:27:36 +01:00
Philippe GRAND
0d089f2fec fix : The condition == 3 is always false 2019-01-25 15:50:30 +01:00
Laurent Destailleur
e42fe4022a Uniformize lenght of small list 2019-01-25 15:22:36 +01:00
Pierre Ardoin
78f8607d41 Add date_livraison substitution 
Complete the substitution for supplier orders.
 2019-01-25 13:15:24 +01:00
Laurent Destailleur
59e993e834 Code comment 2019-01-25 12:03:07 +01:00
Laurent Destailleur
63e04823b2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-25 11:57:01 +01:00
Laurent Destailleur
63c66095e6 Work on file export 2019-01-25 11:56:50 +01:00
ptibogxiv
13ff5f9804 Fix travis & Blank line 2019-01-24 21:32:40 +01:00
Gerhard Stephan
a78e406e76 Added new calculation fields for the doc generator 
- object_total_up  : Sum of all lines (subprice * qty)
- object_total_up_locale : Localized sum of all lines (subprice * qty)
- object_total_discount : Total discount in percent
- object_total_discount_locale : Localized total discount in percent
- line_total_up : Total sum of a line (subprice * qty)
- line_total_up_locale : Localized Total sum of a line (subprice * qty)
 2019-01-24 21:08:13 +01:00
Laurent Destailleur
a5daa25707 Move common code to get sell price into a method 2019-01-24 19:45:17 +01:00
ptibogxiv
a0142a73a5 Update type.php 2019-01-24 19:30:36 +01:00