Commit Graph

20240 Commits

Author SHA1 Message Date
Laurent Destailleur
5c133b9c6c Merge pull request #13686 from frederic34/patch-10
add extrafields in note for enstein and azur
2020-04-22 13:19:07 +02:00
Laurent Destailleur
c1d0cae24d Merge pull request #13692 from hregis/11.0_bug
FIX missing fk_bank during export of suppliers invoices
2020-04-22 13:18:46 +02:00
Laurent Destailleur
8754fc1d1e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-22 12:40:21 +02:00
Laurent Destailleur
9a5986e190 css 2020-04-22 12:40:11 +02:00
Regis Houssin
f6f9ca48dd FIX missing fk_bank during export of suppliers invoices 2020-04-22 12:23:26 +02:00
florian HENRY
8be14060d6 fix: avoid php notice 2020-04-22 12:08:05 +02:00
VESSILLER
cce3085a79 NEW can update contact in import model 2020-04-22 10:44:23 +02:00
Laurent Destailleur
2541d41809 Merge pull request #13669 from pstructures/new-devlelop
Add default values to extrafields
2020-04-22 01:06:04 +02:00
Laurent Destailleur
f52408cec1 Look and feel v12 2020-04-22 00:55:38 +02:00
Laurent Destailleur
5c573e197b Look and feel v12 2020-04-22 00:50:04 +02:00
Frédéric FRANCE
8f42707220 Update pdf_crabe.modules.php 2020-04-21 23:20:11 +02:00
Frédéric FRANCE
7972a35e36 Update pdf_azur.modules.php 2020-04-21 23:12:12 +02:00
Frédéric FRANCE
2fde77703d add extrafields in note for enstein 2020-04-21 23:06:41 +02:00
Laurent Destailleur
770fca0b33 Debug the double language feature in pdf 2020-04-21 20:16:36 +02:00
Laurent Destailleur
042fb4641f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/de_DE/install.lang
	htdocs/langs/de_DE/main.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/projects.lang
2020-04-21 18:33:11 +02:00
Laurent Destailleur
7b99ebfca5 Debug generic translation of fields 2020-04-21 14:54:30 +02:00
Laurent Destailleur
1ef89eb1a1 Fix $mysoc global not loaded. 2020-04-21 14:14:49 +02:00
Laurent Destailleur
ff5bf040e8 FIX text version of html emailing (removed the body style) 2020-04-21 11:19:27 +02:00
mattsidnell
9040c9680d Removed whitespace 2020-04-20 23:44:23 +01:00
mattsidnell
3f42bfb40f change 2020-04-20 23:42:12 +01:00
Matt Sidnell
59b574742b Update commonobject.class.php 2020-04-20 22:52:36 +01:00
Matt Sidnell
ea9f0097a2 Add default values for Create
Added default extrafield values for html and text fields to prepopulate data on record create only.
2020-04-20 22:42:13 +01:00
Laurent Destailleur
cadb52c5b3 Look and feel v12 2020-04-20 19:39:34 +02:00
Laurent Destailleur
230fe26b58 Look and feel v12 2020-04-20 18:38:25 +02:00
Laurent Destailleur
acc7c371cb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contact/vcard.php
	htdocs/core/boxes/box_birthdays.php
	htdocs/core/boxes/box_birthdays_members.php
	htdocs/core/lib/date.lib.php
2020-04-20 16:10:19 +02:00
Laurent Destailleur
4cd5a1d885 Merge pull request #13661 from frederic34/patch-1
remove debug
2020-04-20 16:03:25 +02:00
Laurent Destailleur
67a7d6b77d Look and feel v12 2020-04-20 15:57:15 +02:00
Frédéric FRANCE
9697085f12 remove debug 2020-04-20 15:36:08 +02:00
Laurent Destailleur
16e46c672c Clean code 2020-04-20 15:06:27 +02:00
Laurent Destailleur
40b3db940c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-20 14:44:36 +02:00
Laurent Destailleur
b90217d860 Merge pull request #13655 from frederic34/patch-4
fix indent
2020-04-20 14:38:17 +02:00
Laurent Destailleur
c31fdd26b9 Merge pull request #13654 from frederic34/patch-1
Update interface_80_modStripe_Stripe.class.php
2020-04-20 14:35:24 +02:00
Laurent Destailleur
dfd1711f53 Update interface_80_modStripe_Stripe.class.php 2020-04-20 14:35:11 +02:00
Laurent Destailleur
fe674f08d9 Fix option WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER 2020-04-20 03:00:10 +02:00
Laurent Destailleur
8d59ce2e03 Look and feel v12 2020-04-20 02:48:05 +02:00
Laurent Destailleur
fa056e59df Look and feel v12 2020-04-20 02:14:43 +02:00
Frédéric FRANCE
7b68a2a60e Update pdf_crabe.modules.php 2020-04-19 21:50:52 +02:00
Frédéric FRANCE
ca3402c4cf Update interface_80_modStripe_Stripe.class.php 2020-04-19 21:33:31 +02:00
Laurent Destailleur
7b68d4260c Fix permission on button 2020-04-19 15:50:32 +02:00
Maxime Kohlhaas
817e16d652 Fix birthdays boxes and filter on month 2020-04-18 20:01:18 +02:00
Laurent Destailleur
ae80b09327 Merge pull request #13598 from atm-maxime/new_fields_on_group
New : refactor UserGroup module with new common way
2020-04-18 16:26:58 +02:00
ATM john
e230a3a264 add num row test 2020-04-18 16:24:12 +02:00
ATM john
f2435f6247 Move methods to cunits class 2020-04-18 16:08:26 +02:00
Laurent Destailleur
2f2e3d5057 Merge pull request #13145 from atm-john/12.0_new_extend_retained_warranty
NEW : Extend retained warranty to be  available for all invoices
2020-04-18 15:32:33 +02:00
Laurent Destailleur
5c18404083 Move to jquery 4.0.13 with fix in reponsive
Restore some files modified by error.
2020-04-18 15:15:35 +02:00
Laurent Destailleur
8f7c3fc867 Fix: restore jselect2 4.0.5 (4.0.6 create troubles in responsive) 2020-04-18 14:39:02 +02:00
ATM john
395446a924 Add getRows method and comments 2020-04-18 13:44:13 +02:00
ATM john
09591d75f6 Sql write less do more... 2020-04-18 13:20:08 +02:00
ATM john
e915552ae1 New class tool for converting units 2020-04-18 13:12:11 +02:00
Laurent Destailleur
f23266e560 css 2020-04-18 11:40:26 +02:00