lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
82,809 Commits 43 Branches 150 Tags 886 MiB
5d4ea0b4c4
Commit Graph

82809 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
5d4ea0b4c4 FIX Label of status of social contribution 2020-01-23 19:28:56 +01:00
Laurent Destailleur
27a0858050 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
 2020-01-23 17:41:31 +01:00
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
41577714ce Add link to pay online into sponge template. 2020-01-23 11:25:08 +01:00
Laurent Destailleur
1d4a803d8d
Merge pull request #12899 from mapiolca/patch-22 
# New Add Link to Pay if Online payment is used
 2020-01-23 11:20:35 +01:00
Laurent Destailleur
298b273496
Merge branch 'develop' into patch-22 2020-01-23 11:20:24 +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
Laurent Destailleur
1b84ff634f Doc 2020-01-23 11:07:02 +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
88d01fbb22 Save also customer account onn card level. 2020-01-22 16:02:28 +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
59dfbc49a7 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-22 14:42:18 +01:00
Laurent Destailleur
2679f057fb Doc 2020-01-22 14:40:43 +01:00
Laurent Destailleur
d6a31f60cd Clean code 2020-01-22 14:39:00 +01:00
Laurent Destailleur
047c22b708 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-22 14:27:51 +01:00
Laurent Destailleur
ee21ea5ef8 Fix phpcs 2020-01-22 14:27:38 +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
f06f15de2e
Merge pull request #12861 from TobiasSekan/ShowHolidaysInAgenda 
New: Show holidays in the agenda view (month, week, day)
 2020-01-22 14:13:55 +01:00
Laurent Destailleur
57569604b2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-22 14:11:53 +01:00
Laurent Destailleur
d3411a79ef Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-22 14:11:44 +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
3c2d0b97f4
Merge pull request #12895 from atm-quentin/NEW_author_order_list 
NEW author on order list
 2020-01-22 13:58:53 +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
46df9e59ab
Merge pull request #12888 from andreubisquerra/master 
Fix escpos DummyConnector
 2020-01-22 13:56:43 +01:00
Laurent Destailleur
839f1b83fd
Merge pull request #12901 from OPEN-DSI/new-product-list-units-columns 
NEW columns units in product list
 2020-01-22 13:55:50 +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