Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-09 01:12:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
82,406 Commits 39 Branches 191 Tags
b3bbb23dae80993e2e6fa446474cfeee8d5e294d
Commit Graph

82406 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
b3bbb23dae Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/smtps.class.php
 2020-01-23 17:38:14 +01:00
Laurent Destailleur
8030558117 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/smtps.class.php
 2020-01-23 17:34:40 +01:00
Laurent Destailleur
42769e2e7d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-01-23 17:30:30 +01:00
Laurent Destailleur
7ee37ddd3f FIX Error in log for email sending with smtps was not complete 2020-01-23 17:30:05 +01:00
Laurent Destailleur
7ad827f212 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
 2020-01-23 12:09:01 +01:00
Laurent Destailleur
be344518c4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/core/lib/functions2.lib.php
 2020-01-23 12:07:17 +01:00
Laurent Destailleur
3a9ef7c5e7 Merge pull request #12911 from aspangaro/9.0_FEC 
FIX: FEC export format
 2020-01-23 12:04:55 +01:00
Laurent Destailleur
cbe396b97c Update functions2.lib.php 2020-01-23 12:04:14 +01:00
Laurent Destailleur
1487158082 Update functions2.lib.php 2020-01-23 12:02:29 +01:00
Laurent Destailleur
646ccc1354 Fix error management 2020-01-23 11:52:00 +01:00
Alexandre SPANGARO
7f47b48559 Move function to functions2.lib.php 2020-01-23 11:47:30 +01:00
Laurent Destailleur
8a55b4d82e Merge pull request #12912 from laudeco/hotfix/stock_movement_date_as_integer 
FIX - API - DLC/DLUO date for stock movement
 2020-01-23 11:37:31 +01:00
Laurent Destailleur
58b229a790 Merge pull request #12914 from RubenRuCh/11.0 
Fix: strict mode mysql compatibility
 2020-01-23 11:15:02 +01:00
Laurent Destailleur
fa305a1471 Update box_factures_imp.php 2020-01-23 11:14:27 +01:00
AdrianDominik
cc96da2741 Fix: strict mode mysql compatibility 2020-01-23 10:47:52 +01:00
Laurent De Coninck
7ec17f17d5 FIX - API - DLC/DLUO date for stock movement 
Instead of giving a string to the creation of a stock movement, we have
to give an integer.

This PR fixes that.

[see: X]
 2020-01-23 09:41:22 +01:00
Alexandre SPANGARO
5eeef771fa FIX: FEC export format 2020-01-23 06:20:31 +01:00
Laurent Destailleur
553107258e Fix alignement 2020-01-22 17:00:54 +01:00
Laurent Destailleur
040f8bef5a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/societe/class/societe.class.php
 2020-01-22 16:29:04 +01:00
Laurent Destailleur
381f2d5eee Fix typo 2020-01-22 16:24:16 +01:00
Laurent Destailleur
7964699674 FIX Check on unicity on prof id was not triggered sometimes 2020-01-22 16:22:53 +01:00
Laurent Destailleur
28d0b85b84 Fix phpcs 2020-01-22 14:56:19 +01:00
Laurent Destailleur
25665daa40 FIX #11957 2020-01-22 14:53:40 +01:00
Laurent Destailleur
2caa4e9fa6 Merge pull request #12885 from leninrivas/10.0 
FIX Missing Linked objects Fichinter Ref. in PDF formats
 2020-01-22 14:17:25 +01:00
Laurent Destailleur
bfc8369418 Fix phpcs 2020-01-22 14:15:08 +01:00
Laurent Destailleur
4686be34d2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/product/class/product.class.php
	htdocs/stripe/charge.php
 2020-01-22 14:10:46 +01:00
Laurent Destailleur
cb41168904 Merge pull request #12889 from mapiolca/patch-21 
Fix double display of create credit note button
 2020-01-22 13:57:47 +01:00
Laurent Destailleur
0c4e736e13 Merge pull request #12893 from aspangaro/10.0_p33 
Fix : Accounting - error on right
 2020-01-22 13:54:45 +01:00
Laurent Destailleur
d141d9516b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-01-22 13:53:31 +01:00
Laurent Destailleur
fc894d7a20 Fix for stripe connect 2020-01-22 13:53:20 +01:00
Laurent Destailleur
3d474d5174 Merge pull request #12902 from ptibogxiv/patch-293 
fix stripe/charge.php for connect mode with payment intent
 2020-01-22 13:53:04 +01:00
Laurent Destailleur
999e363446 Update charge.php 2020-01-22 13:52:37 +01:00
Laurent Destailleur
3bd4580e9b Merge pull request #12904 from OPEN-DSI/v10-product-unit-length-update 
FIX length, width and height units coherence in product table
 2020-01-22 13:48:18 +01:00
Laurent Destailleur
e96ef17737 Merge pull request #12903 from atm-john/10.0_fix_dom_and_missing_param 
FIX dom and missing param
 2020-01-22 13:45:06 +01:00
Laurent Destailleur
443e4e2223 Update html.form.class.php 2020-01-22 13:44:42 +01:00
Laurent Destailleur
0456994f0d Responsive 2020-01-22 13:34:21 +01:00
Laurent Destailleur
d87419f3db FIX #11957 2020-01-22 13:34:07 +01:00
Laurent Destailleur
13a9a22cc5 Fix responsive demo 2020-01-22 13:02:50 +01:00
Laurent Destailleur
de99426247 Fix MRP 2020-01-22 12:53:51 +01:00
Laurent Destailleur
0c666ee73b Fix reponsive 2020-01-22 12:46:01 +01:00
Laurent Destailleur
7a0bff06b9 Fix reponsive 2020-01-22 12:44:10 +01:00
Laurent Destailleur
edc79e7398 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/admin/account.php
 2020-01-21 22:39:01 +01:00
Laurent Destailleur
69fae5a679 Fix search on accounting account when option to padd 0 is on. 2020-01-21 22:38:03 +01:00
Laurent Destailleur
80648db7fc Fix search on accounting account when option to padd 0 is on. 2020-01-21 22:26:37 +01:00
Laurent Destailleur
8f1737952d Fix search on accounting account when option to padd 0 is on. 2020-01-21 22:20:32 +01:00
Laurent Destailleur
a36b0ea4f5 Fix filter on parent account in list of accounting accounts 2020-01-21 21:36:40 +01:00
Laurent Destailleur
fd02ed4317 Fix label 2020-01-21 20:50:58 +01:00
VESSILLER
c91ab621b8 FIX length, width and height coherence in product table 2020-01-21 17:49:27 +01:00
Laurent Destailleur
4922567a27 Add .noexec extension for old php4, php5... files 2020-01-21 15:02:04 +01:00
John Botella
d6766af35d Fix dom and missing param 2020-01-21 14:17:53 +01:00