lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
68,848 Commits 43 Branches 150 Tags 886 MiB
f8b0e535fa
Commit Graph

68848 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
40f681695c
Merge pull request #8888 from Mavyre/develop 
FIX Button Classify abandonned for donation not displaying
 2018-05-30 10:51:22 +02:00
Laurent Destailleur
696b4c219e
Merge branch 'develop' into develop 2018-05-30 10:51:12 +02:00
Laurent Destailleur
1ad2ca3648
Merge pull request #8889 from rassakali/patch-4 
Update card.php
 2018-05-30 10:50:32 +02:00
Laurent Destailleur
7590df85e6
Merge pull request #8887 from atm-florian/6.0 
add hook on balence pages
 2018-05-30 10:47:59 +02:00
Laurent Destailleur
aa59c380ad
Merge pull request #8886 from ATM-Nicolas/fix_supplier_order 
FIX : Keep supplier proposal price for supplier order
 2018-05-30 10:45:37 +02:00
Laurent Destailleur
e57ceab5de
Update fournisseur.commande.class.php 2018-05-30 10:45:06 +02:00
ATM-Nicolas
48a315f6cd FIX : Bad substitution key used for default send proposal email 2018-05-30 10:14:34 +02:00
Inovea Conseil
fc7b88e5e6
Fix missing substitution 
Missing substitution for object
 2018-05-29 23:04:35 +02:00
rassakali
52a9c787bb
Update card.php 
Fix #5606
 2018-05-29 21:00:46 +02:00
Mavyre
6ba6258d14
Fixed Classify abandonned not displaying 2018-05-29 17:36:24 +02:00
florian HENRY
b65b545e0f add hook on balence pages 2018-05-29 16:29:14 +02:00
Laurent Destailleur
ee83b9a7b2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-29 12:48:01 +02:00
Laurent Destailleur
57664c5a26 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/list.php
	htdocs/public/payment/newpayment.php
	htdocs/public/paypal/newpayment.php
 2018-05-29 12:47:42 +02:00
Laurent Destailleur
b846f0f84c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-29 12:42:33 +02:00
Laurent Destailleur
2e2cc55350 Backport fix of file checker generation 2018-05-29 12:15:28 +02:00
Laurent Destailleur
95e3c5a4b1 Backport fix of file list check generation 2018-05-29 12:13:58 +02:00
ATM-Nicolas
6b0b975ffd FIX : Keep supplier proposal price for supplier order 2018-05-29 11:21:30 +02:00
Laurent Destailleur
5b96b1b0e3
Merge pull request #8882 from atm-florian/develop 
fix command list
 2018-05-29 11:15:19 +02:00
Laurent Destailleur
51b5f63ce8
Merge pull request #8880 from wdammak/patch-14 
Add movement generateDocument function (mode dev)
 2018-05-29 11:15:00 +02:00
Laurent Destailleur
2ae9591d0d Fix english name 2018-05-29 11:10:21 +02:00
Laurent Destailleur
8a6207efda Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-29 11:09:30 +02:00
Laurent Destailleur
e64d15a6e0
Update .travis.yml 2018-05-29 11:04:26 +02:00
Laurent Destailleur
86ec2b8c20
Merge pull request #8883 from ATM-Marc/FIX_7.0_commande_list 
FIX: missing parenthesis
 2018-05-29 10:58:52 +02:00
Laurent Destailleur
99ccc50d91
Merge pull request #8876 from frederic34/patch-17 
Delete config
 2018-05-29 10:58:10 +02:00
Laurent Destailleur
0520c7efec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-29 10:57:28 +02:00
Laurent Destailleur
4d60fb3468 Fix size of popup 2018-05-29 10:57:14 +02:00
Laurent Destailleur
aa159f7b76
Merge pull request #8875 from frederic34/patch-16 
fix asset admin
 2018-05-29 10:56:54 +02:00
Laurent Destailleur
36027649ac
Merge pull request #8872 from frederic34/patch-15 
Missing link to disable price by qty
 2018-05-29 10:53:19 +02:00
Laurent Destailleur
cf5f7bf06d
Update price.php 2018-05-29 10:52:55 +02:00
Laurent Destailleur
f473607249
Merge branch 'develop' into patch-15 2018-05-29 10:49:28 +02:00
Laurent Destailleur
1e5276f420
Merge pull request #8871 from el00ruobuob/patch-1 
Update main.inc.php with charset
 2018-05-29 10:48:54 +02:00
Laurent Destailleur
6b8b173cc3
Merge pull request #8869 from frederic34/patch-13 
Update llx_paiementfourn.sql #8723
 2018-05-29 10:47:29 +02:00
Laurent Destailleur
4b58158588
Update 7.0.0-8.0.0.sql 2018-05-29 10:47:14 +02:00
Laurent Destailleur
18898558e4
Merge branch 'develop' into patch-13 2018-05-29 10:46:28 +02:00
Laurent Destailleur
fe2795d7f9
Merge pull request #8867 from ptibogxiv/patch-28 
Fix error in list.php
 2018-05-29 10:45:13 +02:00
Laurent Destailleur
bf480b27f0
Merge pull request #8865 from frederic34/patch-11 
Update admin.php for variant
 2018-05-29 10:44:56 +02:00
Laurent Destailleur
285e74668b
Merge pull request #8864 from frederic34/patch-10 
Fix Travis
 2018-05-29 10:44:16 +02:00
Laurent Destailleur
b3cfed3d04 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-29 10:22:04 +02:00
Laurent Destailleur
01c8b33483 FIX 8870 2018-05-29 10:18:45 +02:00
Laurent Destailleur
7b824e3c48 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-29 10:13:48 +02:00
Laurent Destailleur
7eea70ebc8 FIX #8858 #8860 Backport better compatibility fix 2018-05-29 10:13:34 +02:00
Laurent Destailleur
323bf6ef1f
Merge pull request #8873 from frederic34/loadlangs 
loadlangs
 2018-05-29 10:07:10 +02:00
Laurent Destailleur
21dab0d8ee
Merge pull request #8866 from frederic34/patch-12 
Fix Travis for 7.0
 2018-05-29 10:04:38 +02:00
Laurent Destailleur
f83dedf1b0 Fix space/tab 2018-05-29 10:04:20 +02:00
Laurent Destailleur
b9682660d6
Merge pull request #8834 from Oeris/develop 
NEW : adds billing contacts ids to REST API returns
 2018-05-29 10:01:42 +02:00
Laurent Destailleur
0f50b0ffb1 Code comment 2018-05-29 10:00:08 +02:00
Marc de Lima Lucio
ea9e833ab8 FIX: missing parenthesis 2018-05-28 15:03:24 +02:00
florian HENRY
16503fee58 fix commend list 2018-05-28 10:46:47 +02:00
Neil Orley
748be12da2 Get external contacts ids instead of BILLING contacts ids. 2018-05-28 09:42:24 +02:00
Neil Orley
4ad1f81ea9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2018-05-28 09:30:21 +02:00