lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
75,579 Commits 43 Branches 150 Tags 886 MiB
c049ba7900
Commit Graph

75579 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
c049ba7900
Merge pull request #11076 from frederic34/patch-2 
phpcs fix
 2019-05-02 12:38:45 +02:00
Laurent Destailleur
425dd6faf7
Merge branch 'develop' into patch-2 2019-05-02 12:38:38 +02:00
Laurent Destailleur
86f5889a72
Merge pull request #11078 from Supermanu/help_extrafields 
Show help text for extrafields in forms
 2019-05-02 12:36:15 +02:00
Laurent Destailleur
dcd93db7f5
Merge pull request #11073 from ptibogxiv/patch-158 
FIX : dolibarrize fk_soc ->socid for member
 2019-05-02 12:34:23 +02:00
Laurent Destailleur
626ab59144
Merge pull request #11079 from ptibogxiv/patch-160 
FIX : error with call IsInEEC
 2019-05-02 12:32:48 +02:00
Laurent Destailleur
ceeb9752ce Fix PHPCS 2019-05-02 12:28:40 +02:00
Laurent Destailleur
0f8c7df6fe Debug api of module BOM 2019-05-02 12:19:43 +02:00
Laurent Destailleur
4756499a81 Debug module builder for generation of APIs 2019-05-02 12:03:14 +02:00
Laurent Destailleur
3a8d645fb9 Debug module ticket 2019-05-01 20:55:46 +02:00
Laurent Destailleur
90a1181dc5 Debug module Ticket 2019-05-01 20:41:03 +02:00
Laurent Destailleur
9955af5194 Debug ticket module 2019-05-01 17:53:41 +02:00
Laurent Destailleur
a75c6a81d1 FIX Follow rule to create a new page 2019-05-01 17:15:42 +02:00
Frédéric FRANCE
ac304f58b0
clean new commits 2019-04-30 20:37:59 +02:00
Frédéric FRANCE
5766bb0b8a
Merge remote-tracking branch 'upstream/develop' into patch-2 2019-04-30 20:16:43 +02:00
Laurent Destailleur
61bf731d17 FIX Balance of td 2019-04-30 18:11:35 +02:00
Laurent Destailleur
9c45b781af Fix balance of colspan 2019-04-30 16:44:11 +02:00
Laurent Destailleur
203998a2c7 Fix loading of website page object not done for home page 2019-04-30 13:51:04 +02:00
Laurent Destailleur
feb0800208 Fix loading of website page object not done for home page 2019-04-30 13:50:31 +02:00
Laurent Destailleur
0cd1fc79f2 NEW Add a security permission to edit php dynamic content on website. 2019-04-30 13:05:13 +02:00
Laurent Destailleur
3007905508 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/core/modules/modService.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/stripe/class/stripe.class.php
 2019-04-30 03:30:40 +02:00
Laurent Destailleur
f2ecdac454 Fix idempotency_key 
Conflicts:
	htdocs/stripe/class/stripe.class.php
 2019-04-30 03:12:03 +02:00
Laurent Destailleur
acfc251253 Fix idempotency key 2019-04-30 03:09:54 +02:00
Laurent Destailleur
f50210ef39 Fix idempotency_key 2019-04-30 03:07:20 +02:00
Laurent Destailleur
c12a16abea Fix trans 2019-04-30 02:49:13 +02:00
Laurent Destailleur
d55c440740 Fix some product and services export profiles 2019-04-29 21:23:01 +02:00
Laurent Destailleur
ef8bb1f5ca Add MAIN_DOLEDITOR_HEIGHT as quick hack to fix pb of too small area 2019-04-29 20:55:45 +02:00
Laurent Destailleur
101f6a5af3 FIX Several fixes on import of services/products 2019-04-29 20:41:36 +02:00
Supermanu
bbc6c0fe0c Show help text for extrafields in forms 2019-04-29 20:18:47 +02:00
Laurent Destailleur
5d40124b22 Fix import of product price with multilevel prices 2019-04-29 20:15:03 +02:00
Laurent Destailleur
627ef14454 FIX The autocopy feature was ko for suppliers 2019-04-29 18:51:15 +02:00
Laurent Destailleur
899f41d68c Fix bad constant MAIN_MAIL_AUTOCOPY into email form of project page. 2019-04-29 18:26:27 +02:00
Laurent Destailleur
3393aba85f Fix autocopy on projects 2019-04-29 18:19:56 +02:00
Laurent Destailleur
5f54bd250c Suuport SETIFEMPTY flag 2019-04-29 17:21:27 +02:00
Laurent Destailleur
c7fcecc336 Fix email not loaded 2019-04-29 17:17:25 +02:00
Laurent Destailleur
7c26785cb2 Fix emailcollector 2019-04-29 16:47:00 +02:00
Laurent Destailleur
d0eecf9be5 Fix emailcollector 2019-04-29 16:38:56 +02:00
Laurent Destailleur
483d017fc5 Fix creation of project 2019-04-29 16:16:44 +02:00
Laurent Destailleur
8091cff009 Can edit param of operation for email collector 2019-04-29 15:44:16 +02:00
ptibogxiv
61f2b84f5f
FIX : error with call IsInEEC 2019-04-28 00:49:21 +02:00
Laurent Destailleur
5253c759af Fix overwrite feature 2019-04-27 21:42:52 +02:00
Laurent Destailleur
70975b36c7 Fix link 2019-04-27 19:46:53 +02:00
Laurent Destailleur
789a76320a Fix info message 2019-04-27 19:43:48 +02:00
Laurent Destailleur
6b2b996935 Missing translation 2019-04-27 19:41:47 +02:00
Laurent Destailleur
3c90461502 Better error message in convert odt to pdf 2019-04-27 17:31:14 +02:00
Laurent Destailleur
9fc523bca7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-27 13:49:43 +02:00
Laurent Destailleur
c43bc63d2e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-04-27 13:49:13 +02:00
Laurent Destailleur
bd15bf2952 CSS 2019-04-27 13:43:11 +02:00
Laurent Destailleur
a7530b7eff Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-04-27 13:28:36 +02:00
Laurent Destailleur
0532598ecf Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-04-27 13:28:05 +02:00
Laurent Destailleur
410a3801da Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-04-27 13:27:52 +02:00