Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
77,154 Commits 35 Branches 179 Tags 1.7 GiB
f4e58aab22
Commit Graph

67611 Commits

Author SHA1 Message Date
Laurent Destailleur
f4e58aab22 FIX Enable web site 2019-08-13 04:49:49 +02:00
Laurent Destailleur
ac57e527ce Fix translation 2019-08-12 19:01:23 +02:00
Laurent Destailleur
b3e9cf3be7 Sync transifex 2019-08-12 17:37:23 +02:00
Laurent Destailleur
5346135a0c Fix removed duplicate load 2019-08-12 17:12:57 +02:00
Laurent Destailleur
446f0590dc FIX VAT number for Monaco (it uses FR) 2019-08-12 13:45:04 +02:00
Laurent Destailleur
00660d4885 Fix responsive 2019-08-12 02:52:36 +02:00
Laurent Destailleur
49e2f447a8 Fix responsive 2019-08-12 02:41:27 +02:00
Laurent Destailleur
5ca988b3d2 Fix position of requests 2019-08-12 02:36:15 +02:00
Laurent Destailleur
e21d6289ea FIX Can't add a new chart of account 2019-08-10 02:09:59 +02:00
Laurent Destailleur
9c92acadaa Fix lang 2019-08-10 01:51:50 +02:00
Laurent Destailleur
d0f1a23f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-10 01:44:08 +02:00
Laurent Destailleur
96fb4c52ea Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2019-08-10 01:43:52 +02:00
Laurent Destailleur
babeb52986
Merge pull request #11624 from ptibogxiv/patch-208 
Fix update stripe api for more compliance to API
 2019-08-10 01:39:31 +02:00
Laurent Destailleur
5dc2fd8ca0
Merge pull request #11621 from ptibogxiv/patch-205 
Fix application_fee_amount
 2019-08-10 01:38:30 +02:00
Laurent Destailleur
31fa26c2be Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-08-10 01:36:50 +02:00
Laurent Destailleur
0cb1210acc
Merge pull request #11622 from ptibogxiv/patch-206 
Fix table in admin stripe.php
 2019-08-10 01:33:57 +02:00
Laurent Destailleur
13a8ef8258
Merge pull request #11618 from ptibogxiv/patch-203 
FIX author in message / ticket API
 2019-08-10 01:33:21 +02:00
Laurent Destailleur
c647195689
Merge pull request #11632 from atm-greg/FIX_delivery_Extrafields 
FIX delivery extrafields
 2019-08-10 01:28:46 +02:00
Laurent Destailleur
76b0f42d4c
Merge pull request #11620 from ptibogxiv/patch-204 
FIX document list for products in API
 2019-08-10 01:27:52 +02:00
Laurent Destailleur
6089547e0e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-10 01:26:18 +02:00
Laurent Destailleur
46a5c05b75
Merge pull request #11623 from ptibogxiv/patch-207 
FIX round for application fee in stripe
 2019-08-10 01:25:07 +02:00
Laurent Destailleur
eea5ad9b81
Merge pull request #11627 from ptibogxiv/patch-209 
FIX display payment intent in stripe's charge list
 2019-08-10 01:23:06 +02:00
Laurent Destailleur
ab370137a8
Merge pull request #11628 from ptibogxiv/patch-210 
FIX display only stripe sources for customer
 2019-08-10 01:21:41 +02:00
Laurent Destailleur
2824dee11a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/product/dynamic_price/class/price_parser.class.php
 2019-08-10 01:20:17 +02:00
Laurent Destailleur
049a08f435
Merge pull request #11631 from frederic34/patch-9 
Update admin.lang
 2019-08-10 01:15:28 +02:00
Laurent Destailleur
cee92356c6
Merge pull request #11644 from frederic34/patch-11 
Update price_parser.class.php
 2019-08-10 01:11:02 +02:00
Laurent Destailleur
6a8910f109
Merge pull request #11649 from ptibogxiv/patch-216 
FIX qty in invoice list on product's stats
 2019-08-10 00:37:35 +02:00
Je2fb
2dee289fc6 Update price_parser.class.php 
Calculation with supplier_min_price work

Conflicts:
	htdocs/product/dynamic_price/class/price_parser.class.php
 2019-08-10 00:21:13 +02:00
Laurent Destailleur
f752b96a7e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-10 00:14:27 +02:00
Abbes Bahfir
8f2786cf7b fix:this is not accessible in static context 2019-08-10 00:09:36 +02:00
Laurent Destailleur
88c66d24fe
Merge pull request #11662 from ptibogxiv/patch-219 
FIX duration when creating service
 2019-08-09 23:53:55 +02:00
Regis Houssin
0b831ccdf7 FIX better help message with multicompany 2019-08-09 09:33:14 +02:00
ptibogxiv
322ec32ff5
FIX duration when creating service 2019-08-07 20:16:53 +02:00
ptibogxiv
0fc92b92a2
Update facture.php 2019-08-06 16:47:54 +02:00
ptibogxiv
ee8d99351d
Update facture.php 2019-08-06 16:28:18 +02:00
Frédéric FRANCE
69985339d8
Update price_parser.class.php 2019-08-06 11:47:34 +02:00
ptibogxiv
05ac4eec52
Update charge.php 2019-08-06 00:16:18 +02:00
Frédéric FRANCE
7f23b77cbe
Update pdf_proforma.modules.php 2019-08-05 15:00:06 +02:00
Frédéric FRANCE
fde526f59d
Update pdf_einstein.modules.php 2019-08-05 14:58:50 +02:00
atm-greg
1d4fc32c20 fix second bad test 2019-08-05 13:13:56 +02:00
atm-greg
41c07b9b43 fix bad test in delivery card 2019-08-05 13:10:26 +02:00
Frédéric FRANCE
baa2e870d0
Update admin.lang 
found in admin/company.php
 2019-08-05 11:01:58 +02:00
Laurent Destailleur
d663657f15 FIX format of field with type timestamp 2019-08-04 13:06:48 +02:00
ptibogxiv
4633af3f5d
Update charge.php 2019-08-03 21:19:47 +02:00
ptibogxiv
4ed1ff5b9b
Fix display only stripe sources for customer 2019-08-03 21:17:12 +02:00
Laurent Destailleur
5339bb71ac FIX Fatal situation if payment removed on expense report. Action 
set_unpaid was not available.
 2019-08-03 20:57:21 +02:00
Laurent Destailleur
7f42380f83 FIX Fatal situation if payment removed on expense report. Action 
set_unpaid was not available.
 2019-08-03 20:53:57 +02:00
Laurent Destailleur
f210e286bd Fix balance of div 2019-08-03 20:53:28 +02:00
Laurent Destailleur
f3e38f4b09 FIX Fatal situation if payment removed on expense report. Action 
set_unpaid was not available.
 2019-08-03 20:53:18 +02:00
ptibogxiv
07cc21a113
Fix display payment intent in stripe's charge list 2019-08-03 20:35:53 +02:00