Laurent Destailleur
912e29a746
FIX #11244
2019-05-29 11:06:01 +02:00
Laurent Destailleur
3c05cfe690
Fix useless test
2019-05-29 10:50:33 +02:00
Laurent Destailleur
b46b675b7c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-05-29 10:36:00 +02:00
Christophe Battarel
83d883c36a
finally eldy is always right
2019-05-24 15:14:34 +02:00
Christophe Battarel
545cdd0762
test include return on FALSE
2019-05-24 12:54:24 +02:00
Christophe Battarel
abc7c2f0f8
test include return on TRUE
2019-05-24 12:33:40 +02:00
Christophe Battarel
aaaad71347
FIX : do not include disabled modules tpl
2019-05-24 12:10:58 +02:00
Laurent Destailleur
43e098caae
Fix phpcs
2019-05-23 12:35:53 +02:00
Laurent Destailleur
111239094a
Work to finish module BOM for v10
2019-05-22 20:28:24 +02:00
Laurent Destailleur
c3732f2b7a
Fix edition of margins in recurring invoices
2019-05-20 14:41:47 +02:00
Francis Appels
6e5d826d65
Clean PHPCS for commonobject.class
2019-05-13 22:02:33 +02:00
Laurent Destailleur
590b1d1e90
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
2019-05-08 18:24:50 +02:00
Laurent Destailleur
f2e24ed96e
Fix bad contact used
2019-05-08 18:20:28 +02:00
Laurent Destailleur
1e036f3513
Correct support for type price on module builder
...
Fix link of ref in cash fence list
2019-05-08 01:09:38 +02:00
Lionel VESSILLER
87e83a7967
New add extrafield separator collapse with theses specific values
...
- empty for a simple separator
- 1 to extend by default all extrafields after the separator position
- 2 to collapse by default all extrafields after the separator position
2019-05-03 16:14:44 +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
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
Supermanu
bbc6c0fe0c
Show help text for extrafields in forms
2019-04-29 20:18:47 +02:00
Laurent Destailleur
8e9a4e1877
Fix output of fields with type "real"
2019-04-13 10:42:43 +02:00
Laurent Destailleur
861c1b412c
CSS
2019-04-09 19:23:34 +02:00
Christophe Battarel
f167ad910e
camelCase and generic cloneCategories function
2019-04-05 11:30:51 +02:00
Laurent Destailleur
fff9b7db9d
Fix doxygen
2019-04-04 18:33:12 +02:00
Laurent Destailleur
aa33e4fd2a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-03-21 18:26:29 +01:00
Laurent Destailleur
55d64d441f
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-03-21 18:26:02 +01:00
Laurent Destailleur
a1fe1bb58c
FIX when 2 extra fields are mandatory in 2 different entities
2019-03-21 12:33:39 +01:00
Laurent Destailleur
5d21547854
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/product/price.php
htdocs/user/perms.php
2019-03-21 12:20:24 +01:00
Laurent Destailleur
a7fdd34973
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-03-21 12:17:50 +01:00
Laurent Destailleur
032aa869e4
FIX Can't insert if there is extrafields mandatory on another entity.
...
FIX Can't set default value of extrafield of type varchar
2019-03-21 12:14:15 +01:00
Laurent Destailleur
4c85068a85
FIX Can't insert if there is extrafields mandatory on another entity.
2019-03-21 11:53:04 +01:00
atm-greg
a8cdb63a25
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Hook_on_commonGenerateDocument
2019-03-20 06:49:36 +01:00
Laurent Destailleur
d44be341a5
NEW Add property 'noteditable' in modulebuilder
2019-03-17 01:45:46 +01:00
Laurent Destailleur
6ae36ce6a7
Work on BOM
2019-03-12 19:20:01 +01:00
Frédéric FRANCE
b47a54c652
update doc in commonobject class
2019-03-09 18:05:48 +01:00
Laurent Destailleur
a426c8e9bf
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/compta/facture/class/facture.class.php
htdocs/filefunc.inc.php
htdocs/install/upgrade2.php
htdocs/product/class/product.class.php
2019-03-07 11:16:24 +01:00
gauthier
598d1fc914
FIX : extrafields always visible on view mode
2019-03-05 16:53:36 +01:00
Laurent Destailleur
ca9449c70e
Work on BOM
2019-03-04 14:01:30 +01:00
Frédéric FRANCE
9b165f6b3f
add visibility
2019-02-27 20:45:07 +01:00
Frédéric FRANCE
5a4ac82880
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-02-27 08:23:29 +01:00
Frédéric FRANCE
c89e4d79b8
wip
2019-02-25 22:27:04 +01:00
Alexandre SPANGARO
acb9cfe07a
NEW: Add LinkedIn field
2019-02-25 09:07:58 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma
2019-02-03 19:27:16 +01:00
Laurent Destailleur
9f7dfe2921
Merge pull request #10481 from frederic34/psr2forloop
...
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
2019-02-03 19:11:07 +01:00
Laurent Destailleur
e309261140
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-03 18:19:58 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-03 14:29:45 +01:00
Frédéric FRANCE
03701fa091
psr2
2019-02-02 18:25:01 +01:00
Laurent Destailleur
ebe30f7a0e
FIX error report not returned
2019-02-01 19:19:23 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00