Commit Graph

72441 Commits

Author SHA1 Message Date
Laurent Destailleur
09f809f347 FIX #12913 2020-01-25 14:03:24 +01:00
Laurent Destailleur
de6b30be8c Look and feel v11 2020-01-25 13:06:10 +01:00
Laurent Destailleur
09e707b818 trans 2020-01-25 13:05:40 +01:00
Laurent Destailleur
be70232bfe Clean code 2020-01-25 12:10:00 +01:00
Laurent Destailleur
cc6b9269f9 Fix look and feel v11 2020-01-25 11:50:16 +01:00
Laurent Destailleur
c494e3029b Trans 2020-01-24 20:14:01 +01:00
Laurent Destailleur
8f3f34e1c0 Fix css 2020-01-24 20:11:07 +01:00
Laurent Destailleur
d5f2a793c0 CSS 2020-01-24 19:36:17 +01:00
Laurent Destailleur
3a7c0b63f1 css 2020-01-24 17:56:41 +01:00
Laurent Destailleur
5d7fa55759 css 2020-01-24 17:48:24 +01:00
Laurent Destailleur
de4183ea65 Update logos 2020-01-24 17:30:46 +01:00
Laurent Destailleur
209ebfbe2f Fix trans 2020-01-24 16:14:52 +01:00
Laurent Destailleur
923e315dae Debug cashfence feature 2020-01-24 15:59:36 +01:00
Laurent Destailleur
779cd94b0e Debug cashfence feature 2020-01-24 15:26:18 +01:00
Laurent Destailleur
17f28189f9 Virtual stock must include Manufacturing Orders 2020-01-24 14:51:45 +01:00
Laurent Destailleur
540713510e Fix load of segment prices not required for virtual stock change
virtual stock must include production (WIP)
2020-01-23 21:03:15 +01:00
Laurent Destailleur
e1123c63a9 Fix field label 2020-01-23 19:42:00 +01:00
Laurent Destailleur
b74d37338b Fix trans 2020-01-23 19:37:34 +01:00
Laurent Destailleur
a44d534e64 Fix label 2020-01-23 19:32:34 +01:00
Laurent Destailleur
423be8a139 FIX Label of status of social contribution 2020-01-23 19:30:02 +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
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
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