Commit Graph

88411 Commits

Author SHA1 Message Date
Laurent Destailleur
a72f66b456 Fix: dictionnaries are edited per entity 2021-06-13 16:32:06 +02:00
Laurent Destailleur
e0abbb2525 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-13 16:24:21 +02:00
Laurent Destailleur
0cbcba7bc4
Merge pull request #17916 from frederic34/patch-16
fix warnings
2021-06-13 16:21:44 +02:00
Laurent Destailleur
205a6fac98
Merge pull request #17910 from frederic34/patch-11
fix PDF BACKGROUND not found
2021-06-13 16:21:05 +02:00
Laurent Destailleur
e9dc9b87b2
Merge pull request #17911 from frederic34/patch-12
Update pdf_standard_recruitmentjobposition.modules.php
2021-06-13 16:20:34 +02:00
Laurent Destailleur
48b604e4d5
Merge pull request #17905 from aspangaro/14a26
Accountancy - Maxi debug of new functionnality date validation
2021-06-13 16:19:44 +02:00
Laurent Destailleur
bc00a1a0f3
Merge pull request #17903 from dolibit-ut/patch-342
Update llx_c_chargesociales.sql
2021-06-13 16:17:04 +02:00
Laurent Destailleur
6708800d54
Merge pull request #17902 from frederic34/patch-9
fix warnings
2021-06-13 16:16:21 +02:00
Laurent Destailleur
172f1b5260 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-13 16:16:17 +02:00
Laurent Destailleur
1c7f141f06
Merge pull request #17901 from frederic34/patch-8
fix warning
2021-06-13 16:16:06 +02:00
Laurent Destailleur
026d919a03
Merge pull request #17900 from frederic34/patch-7
fix warnings
2021-06-13 16:15:58 +02:00
Laurent Destailleur
ec87115177
Merge pull request #17915 from frederic34/patch-15
fix warning
2021-06-13 16:15:51 +02:00
Laurent Destailleur
56a943b2ea
Merge pull request #17914 from frederic34/patch-14
fix warnings
2021-06-13 16:15:44 +02:00
Laurent Destailleur
c4cba43bad FIX Broken Access Control reported by Ahsan Aziz. 2021-06-13 16:15:05 +02:00
Frédéric FRANCE
20f6a34249
Update list.php 2021-06-13 16:12:46 +02:00
Frédéric FRANCE
d774e19afe
fix warnings 2021-06-13 16:10:45 +02:00
Frédéric FRANCE
791e4ab056
fix warning 2021-06-13 15:59:22 +02:00
Frédéric FRANCE
519d7f1d0f
fix warnings 2021-06-13 15:47:42 +02:00
Frédéric FRANCE
ebc0cc75dd
fix warning 2021-06-13 15:37:54 +02:00
Laurent Destailleur
497e9edbb2 Trans 2021-06-13 15:17:47 +02:00
Laurent Destailleur
abfc87c1de Fix separator extrafields must not appear as selected fields 2021-06-13 13:32:41 +02:00
Frédéric FRANCE
8a6517efb5
Merge remote-tracking branch 'upstream/develop' into patch-9 2021-06-13 08:54:57 +02:00
Frédéric FRANCE
e9913fa9d0
Merge remote-tracking branch 'upstream/develop' into patch-8 2021-06-13 08:53:44 +02:00
Alexandre SPANGARO
cf723d5120 Look a feel v14 CSS Amount 2021-06-13 06:37:44 +02:00
Alexandre SPANGARO
11959ec1ab Fix some date problems 2021-06-13 06:07:01 +02:00
Alexandre SPANGARO
94850cd25b Merge remote-tracking branch 'upstream/develop' into 14a26 2021-06-13 06:06:33 +02:00
Laurent Destailleur
bb48da988b css 2021-06-13 01:32:14 +02:00
Laurent Destailleur
8b9af8f5ab Responsive 2021-06-13 01:27:04 +02:00
Frédéric FRANCE
6ff97ca2c6
Update pdf_standard_recruitmentjobposition.modules.php 2021-06-12 19:28:58 +02:00
Frédéric FRANCE
74e06353e9
fix PDF BACKGROUND not found 2021-06-12 19:25:47 +02:00
Laurent Destailleur
9ba0fe07f0 Fix phpcs 2021-06-12 18:47:29 +02:00
Frédéric FRANCE
a723a8f93e
remove phpcs warning 2021-06-12 18:40:00 +02:00
Laurent Destailleur
7cb647e5b5 Complete log 2021-06-12 17:02:24 +02:00
Laurent Destailleur
a8401ca30d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-12 15:47:18 +02:00
Laurent Destailleur
f13dcb5376 Fix merge 2021-06-12 15:44:03 +02:00
Alexandre SPANGARO
53d0909a7c Merge remote-tracking branch 'upstream/develop' into 14a26 2021-06-12 14:20:00 +02:00
Alexandre SPANGARO
7444ff5412 Update notified 2021-06-12 14:18:44 +02:00
UT from dolibit
c3a27b5ab9
Update llx_c_chargesociales.sql 2021-06-12 10:32:42 +02:00
Frédéric FRANCE
4138353d7f
fix warnings 2021-06-12 09:11:12 +02:00
Frédéric FRANCE
3ca8de8fab
fix warning 2021-06-12 07:20:41 +02:00
Frédéric FRANCE
56afefd6ad
fix warnings 2021-06-12 07:12:45 +02:00
Laurent Destailleur
1933072712
Merge pull request #17893 from atm-john/develop_fix_missing_hooks_for_stock_mvm
New :  Missing hook for stock movements list
2021-06-11 19:58:21 +02:00
Laurent Destailleur
306b7779ff
Merge branch 'develop' into 11p1 2021-06-11 19:55:37 +02:00
Laurent Destailleur
bbb751dc53
Merge pull request #17822 from frederic34/zapier_create_contacts
add more capabilities for zapier
2021-06-11 19:51:01 +02:00
Laurent Destailleur
d3815cbb93 css 2021-06-11 19:42:36 +02:00
Laurent Destailleur
04a500f516
Merge pull request #17850 from moreauftheobald/Develop_hook_on_product_stat
Adding hooks on product stat in order to allow to expand stat on othe…
2021-06-11 19:33:37 +02:00
Laurent Destailleur
5d2f5b2305
Update product.lib.php 2021-06-11 19:33:07 +02:00
Laurent Destailleur
37ebedcafa
Update product.lib.php 2021-06-11 19:32:25 +02:00
Laurent Destailleur
c4d0086b8a Fix hook context names 2021-06-11 19:24:26 +02:00
Laurent Destailleur
756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php
2021-06-11 19:05:05 +02:00