lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
85,691 Commits 43 Branches 150 Tags 886 MiB
042fb4641f
Commit Graph

85691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
f670a68b04 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/mails.php
 2020-04-21 18:29:50 +02:00
Laurent Destailleur
0b790ef327 Sync lang files 2020-04-21 18:18:07 +02:00
Laurent Destailleur
7b99ebfca5 Debug generic translation of fields 2020-04-21 14:54:30 +02:00
Laurent Destailleur
f6735ce8f2 Update repair.sql script 2020-04-21 14:28:52 +02:00
Laurent Destailleur
1ef89eb1a1 Fix $mysoc global not loaded. 2020-04-21 14:14:49 +02:00
Laurent Destailleur
536ab95207 FIX: The "test smtp connectivity" failed on page to setup mass emailing 
Conflicts:
	htdocs/admin/mails.php
 2020-04-21 12:50:20 +02:00
Laurent Destailleur
f8ae5d9972 Fix Do not show value if null 2020-04-21 12:00:14 +02:00
Laurent Destailleur
ff5bf040e8 FIX text version of html emailing (removed the body style) 2020-04-21 11:19:27 +02: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
b8e68a5ef7 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-20 16:06:31 +02:00
Laurent Destailleur
1e0e4d5d6d
Merge pull request #13653 from atm-maxime/fix_box_birthdays 
Fix birthdays boxes and filter on month
 2020-04-20 16:04:52 +02:00
Laurent Destailleur
fb24fbba05
Merge pull request #13662 from atm-gauthier/10.0_fix_vcard 
FIX : we must export company mail address on contact vcard only if co…
 2020-04-20 16:04:17 +02:00
Laurent Destailleur
4cd5a1d885
Merge pull request #13661 from frederic34/patch-1 
remove debug
 2020-04-20 16:03:25 +02:00
gauthier
b72651fdfd FIX : we must export company mail address on contact vcard only if contact email address is empty 2020-04-20 15:59:44 +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
98f370034a Look and feel v12 2020-04-20 14:53:17 +02:00
Laurent Destailleur
2922d16ca2 Look and feel v12 2020-04-20 14:46:02 +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
stickler-ci
27aeaaecb5 Fixing style errors. 2020-04-20 14:42:13 +02:00
Adrien Jacob
91fbccb594 [BUGFIX] Allow update of extra fields 
This is to make supplier invoices consistent with other similar classes
 2020-04-20 14:42:08 +02:00
Laurent Destailleur
dd67973171
Merge pull request #13659 from adrienjacob/patch-1 
[BUGFIX] Allow update of extra fields
 2020-04-20 14:41:21 +02:00
Laurent Destailleur
b90217d860
Merge pull request #13655 from frederic34/patch-4 
fix indent
 2020-04-20 14:38:17 +02:00
Frédéric FRANCE
f546103c01 make dolistore happy again 2020-04-20 14:37:52 +02:00
Laurent Destailleur
e16ceef065
Merge pull request #13656 from frederic34/patch-6 
make dolistore happy again
 2020-04-20 14:36:50 +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
stickler-ci
36385e3b88 Fixing style errors. 2020-04-20 12:16:34 +00:00
Adrien Jacob
68702f8053
[BUGFIX] Allow update of extra fields 
This is to make supplier invoices consistent with other similar classes
 2020-04-20 14:12:08 +02:00
Laurent Destailleur
c7fab6a83e Fix no tooltip of not predefined products 2020-04-20 13:26:06 +02:00
Laurent Destailleur
b92c03cdf6 Fix Look and feel v12 2020-04-20 13:20:09 +02:00
Laurent Destailleur
f816fae86c Fix a duplicated index 2020-04-20 12:21:13 +02:00
Laurent Destailleur
afc04faa64 Fix nb of open tickets 2020-04-20 04:26:16 +02:00
Laurent Destailleur
78474af486 Link missing 2020-04-20 03:14:44 +02:00
Laurent Destailleur
d847f67e45 Look and feel v12 2020-04-20 03:10:26 +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
f53dd01d09 Fix css 2020-04-20 02:15:36 +02:00
Laurent Destailleur
fa056e59df Look and feel v12 2020-04-20 02:14:43 +02:00
Laurent Destailleur
6472f521ac css 2020-04-20 00:54:38 +02:00
Frédéric FRANCE
350e75f283
make dolistore happy again 2020-04-19 22:05:47 +02:00
Frédéric FRANCE
7b68a2a60e
Update pdf_crabe.modules.php 2020-04-19 21:50:52 +02:00
Frédéric FRANCE
5992318af7
Update card.php 2020-04-19 21:49:37 +02:00
Frédéric FRANCE
61e76ef25e
Update api_bankaccounts.class.php 2020-04-19 21:47:30 +02:00
Frédéric FRANCE
ca3402c4cf
Update interface_80_modStripe_Stripe.class.php 2020-04-19 21:33:31 +02:00
Laurent Destailleur
08260cb7a4 Look and feel 2020-04-19 15:52:43 +02:00