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

78950 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ptibogxiv
e464e2e1b8
Fix application_fee name stripe.class.php 
stripe changes name without change API :/

application_fee_amount for amount application_fee for %
 2019-07-26 14:16:28 +02:00
Laurent Destailleur
fac8d93a08 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-26 13:24:08 +02:00
Laurent Destailleur
8b81702dd7 Fix API 404 errors 2019-07-26 13:23:42 +02:00
Laurent Destailleur
9789932f01 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-26 13:18:00 +02:00
Laurent Destailleur
1ca3c6e3ae Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-26 13:17:47 +02:00
Laurent Destailleur
c61f8e965d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-26 13:16:59 +02:00
Laurent Destailleur
e92c6c87a0 FIX API return 404 sometimes even if API exists 2019-07-26 13:16:49 +02:00
Juanjo Menent
f67f99099c NEW: Add hidden option SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT for add possibility to update supplier buying price in the reception on a supplier order 2019-07-26 12:45:46 +02:00
Juanjo Menent
38bb046abb NEW: Add hidden option SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT for add possibility to update supplier buying price in the reception on a supplier order 2019-07-26 12:38:49 +02:00
atm-quentin
f7c739bba9 FIX wrong path sociales/index.php doesnt exist anymore 2019-07-26 12:12:08 +02:00
Juanjo Menent
d58c713621 Merge remote-tracking branch 'upstream/develop' into develop 2019-07-26 11:30:22 +02:00
atm-quentin
1f7cd1a3f8 FIX name was able to be in field but went back to new line 2019-07-26 11:05:16 +02:00
Philippe GRAND
0baea71d0f Merge remote-tracking branch 'upstream/develop' into develop 2019-07-26 07:54:14 +02:00
Laurent Destailleur
3101d52283
Merge pull request #11528 from prietojc/10.0 
Fix: Use special_code=4 for Takepos
 2019-07-25 18:31:53 +02:00
Laurent Destailleur
3a740313fe
Merge branch '10.0' into 10.0 2019-07-25 18:31:26 +02:00
Regis Houssin
2c29f041a0 FIX move sql request in INNER JOIN 2019-07-25 18:28:52 +02:00
Laurent Destailleur
0b69bf9957 FIX #11553 2019-07-25 18:17:17 +02:00
Regis Houssin
5a82b2bc34 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0_ldap 2019-07-25 18:17:01 +02:00
Laurent Destailleur
0c6499f193
Update product.php 2019-07-25 18:01:47 +02:00
Laurent Destailleur
9a0e0fbdd2
Update product.php 2019-07-25 18:01:16 +02:00
Laurent Destailleur
0d79905b0a
Merge pull request #11539 from hregis/9.0_bug2 
FIX duplicate on the check (TODO field $onetrtd not used ?)
 2019-07-25 17:56:42 +02:00
Laurent Destailleur
a46bfc7a29 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/project.lib.php
 2019-07-25 17:54:14 +02:00
Laurent Destailleur
4a8377e4fd Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-25 17:52:40 +02:00
Laurent Destailleur
8241bc414a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/lib/files.lib.php
 2019-07-25 17:52:17 +02:00
Laurent Destailleur
fe9ddd7649 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/lib/files.lib.php
 2019-07-25 17:50:07 +02:00
Laurent Destailleur
e8932335aa
Merge pull request #11544 from atm-josselin/FIX_upload_file_with_multiple_spaces 
FIX : correct error in files with multiple spaces
 2019-07-25 17:48:26 +02:00
Laurent Destailleur
96a90e735c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-25 17:47:13 +02:00
Laurent Destailleur
ff215d9b04
Merge pull request #11547 from ptibogxiv/patch-198 
Fix display civility in contact card
 2019-07-25 17:47:02 +02:00
Laurent Destailleur
95be7ad82a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-25 17:46:58 +02:00
Laurent Destailleur
111c0dcadd Comment 2019-07-25 17:46:48 +02:00
Laurent Destailleur
6e3fad8f83 Fix phpcs 2019-07-25 17:42:44 +02:00
Laurent Destailleur
27c6bfe9db
Merge pull request #11548 from aspangaro/9.0pa 
FIX FEC Format - Missing date_creation in general ledger when you add a new transaction
 2019-07-25 17:37:05 +02:00
Laurent Destailleur
2dc2af7c41
Merge pull request #11552 from aspangaro/10.0_FEC 
Presentation nowrap on amount
 2019-07-25 17:35:36 +02:00
Laurent Destailleur
2f08715d5a
Merge pull request #11559 from atm-florianm/FIX_product.lib.php_needed_for_pdf_generation 
FIX: tk9877 - PDF rouget requires product.lib.php
 2019-07-25 17:34:25 +02:00
Laurent Destailleur
1d7885bc0c FIX We should remove property comments only for project and task api. 2019-07-25 16:58:24 +02:00
Laurent Destailleur
e88ca8ae89 Fix migration 2019-07-25 15:07:24 +02:00
Laurent Destailleur
fe22f11f10 More generic code 2019-07-25 15:07:00 +02:00
Laurent Destailleur
351b877c05 Add structured data product 2019-07-25 14:39:22 +02:00
Laurent Destailleur
fb2a9e371c Fix syntax 2019-07-25 14:27:53 +02:00
Laurent Destailleur
6674b8975b Fix logo of organization 2019-07-25 14:26:48 +02:00
Laurent Destailleur
1978ffb370 Fix 2019-07-25 14:21:39 +02:00
Laurent Destailleur
e29023f155 Fix 2019-07-25 14:12:22 +02:00
Laurent Destailleur
5fd35c1bc9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/website.lib.php
 2019-07-25 13:51:12 +02:00
Laurent Destailleur
d1aa15004e NEW Add method getStructuredData for website 2019-07-25 13:49:56 +02:00
Laurent Destailleur
0bb92ff10d NEW Add method getStructuredDataForBlogPost for website 2019-07-25 13:48:13 +02:00
atm-quentin
efd89588e5 fix trans 2019-07-25 12:21:28 +02:00
Florian Mortgat
65e9d8f239 FIX: tk9877 - PDF rouget requires product.lib.php (otherwise measuring_units_string() is not defined) 2019-07-25 11:14:59 +02:00
Laurent Destailleur
151075402f css 2019-07-24 17:15:25 +02:00
Laurent Destailleur
389976699c Fix responsive 2019-07-24 16:29:50 +02:00
Laurent Destailleur
907ba62054 Sync transifex 2019-07-24 14:59:03 +02:00