Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-14 21:41:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
111,473 Commits 36 Branches 190 Tags
29e64bee8b13c384ce77dbcc1bf3929ba0884c20
Commit Graph

10938 Commits

Author SHA1 Message Date
Alexandre SPANGARO
754b13a83f NEW Add sortorder on units list 2021-10-11 08:58:00 +02:00
Laurent Destailleur
a57925b0b7 FIX edition of fields on credit transfer tab 2021-10-11 01:43:36 +02:00
Laurent Destailleur
7180f5eeff css 2021-10-10 21:25:46 +02:00
Laurent Destailleur
874731af84 The 'action=delete&file=...' has been replaced with 
'action=deletefile&file=...' to avoid confusion with deletion of object
lines.
 2021-10-10 21:11:48 +02:00
Florian HENRY
5d393f201c fix sql 2021-10-08 13:17:09 +02:00
Laurent Destailleur
96b617cb4d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/eventorganization/conferenceorboothattendee_card.php
	htdocs/mrp/mo_list.php
 2021-10-06 18:30:26 +02:00
Indelog
18fb3a352b Add hook to overide sourcetype and targettype for linked object 
This add hook `setLinkedObjectSourceTargetType` in
`CommonObject::showLinkToObjectBlock()` and in
`CommonObject::fetchObjectLinked()` to allow overiding sourcetype and
targettype by custom modules.
 2021-10-06 17:18:45 +02:00
Vincent Dieltiens
2889af9fae Add SOCIETE_SHOW_VAT_IN_LIST option to let the possibility to display (and search) VAT number in list of 'societe' 2021-10-06 15:23:23 +02:00
Laurent Destailleur
4be2d1414e Fix regression 2021-10-06 14:03:10 +02:00
Indelog
45e6ea45dc Fix stickler 2021-10-06 12:19:10 +02:00
Indelog
fb775e2c6e Fix Add module part in llx_element_element on CommonObject::add_object_linked() 
Add module part to target type if object has $module property and is'nt
in core modules.
 2021-10-06 12:14:46 +02:00
Laurent Destailleur
ff56415c00 Merge pull request #18903 from aspangaro/15a21 
HTML5 - <font> tag is deprecated, replace by <span>
 2021-10-05 16:51:41 +02:00
Marc de Lima Lucio
fb13b666b8 FIX: deposit payment terms: susbstitute percentage in payment term label with bespoke substitution key 2021-10-05 15:26:43 +02:00
Marc de Lima Lucio
6ed9e00b4d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2021-10-05 13:35:50 +02:00
Marc de Lima Lucio
f4c22c0ae7 FIX: deposit payment terms: PHPDoc 2021-10-05 13:02:12 +02:00
Indelog
6c82b1d0e1 Fix creataing invoice originating for custom module 
This fix the invoice create form when we provide `origin` element in
url. The actual create form overide the value for origin field with
`$objectsrc->element`. This make creation of invoice originating from a custom
module module impossible because we need the module part to instantiate
the class for the custom module object.

This also modify Common Object::fetch Object Linked() to append the
module part for `$sourcetype` and `$targettype` if it not set and object
have module property and it not in core module.
 2021-10-05 11:35:43 +02:00
Marc de Lima Lucio
54782f5d4c FIX: deposit payment terms: don't show percentage input on lists 2021-10-05 11:11:27 +02:00
Laurent Destailleur
50470f84c4 Look and feel v15. Stay at same position on doc generation 2021-10-05 11:03:51 +02:00
Marc de Lima Lucio
337531f832 FIX: deposit payment terms: correctly restrict them to objet other than invoices and template invoices 2021-10-05 10:54:22 +02:00
Laurent Destailleur
f0703b414a css 2021-10-05 10:24:31 +02:00
Alexandre SPANGARO
edf91ce77c HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:41:03 +02:00
Laurent Destailleur
355f17be3d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-05 09:11:37 +02:00
Laurent Destailleur
5ad02ccc32 MAIN_EMAIL_ADD_TRACK_ID removed, MAIN_FIX_FOR_BUGGED_MTA 1 by defaut 2021-10-05 09:11:20 +02:00
Laurent Destailleur
9617bbb463 Merge pull request #18788 from fr69400/develop 
New : Add showdocument hook
 2021-10-04 20:13:50 +02:00
Laurent Destailleur
2f6a4fa04a Update html.formfile.class.php 2021-10-04 19:20:37 +02:00
Laurent Destailleur
950fccc186 Merge branch 'develop' into NEW_deposit_payment_terms 2021-10-04 19:06:42 +02:00
Marc de Lima Lucio
1b2494855d NEW: deposit payment terms: set required invoice fields + filter payment terms with deposits in select + UI 2021-10-04 18:09:24 +02:00
Laurent Destailleur
6060f0bfb0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/main.lang
 2021-10-04 14:53:44 +02:00
Laurent Destailleur
7b02560c4f Better way to present open invoice graph 2021-10-04 05:27:07 +02:00
Laurent Destailleur
b3cb56f2ef Clean css 2021-10-04 04:14:31 +02:00
Laurent Destailleur
d6e1a6be93 Look and feel v14 2021-10-03 18:20:01 +02:00
Laurent Destailleur
902fed1f0d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/ecm/index.php
 2021-10-02 20:09:06 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
c664b78800 MAIN_SECURITY_CSRF_WITH_TOKEN now has 3 levels (1, 2, 3) 2021-10-01 12:37:32 +02:00
Laurent Destailleur
c244d7375c MAIN_SECURITY_CSRF_WITH_TOKEN now has 3 levels (1, 2, 3) 2021-10-01 12:30:24 +02:00
Laurent Destailleur
166d3b08d6 Add LIBXML_NONET to simplexml_load_string 2021-09-30 20:12:01 +02:00
Laurent Destailleur
673a2982a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/card.php
 2021-09-30 16:32:40 +02:00
Laurent Destailleur
3d4bb66853 Clean code 2021-09-30 15:59:47 +02:00
Laurent Destailleur
608b6f5fa3 Clean code 2021-09-30 15:24:57 +02:00
Laurent Destailleur
3565a47954 Merge branch 'develop' into NEW_develop_virtual_product_DragAndDrop 2021-09-30 14:24:30 +02:00
Laurent Destailleur
ee79df9bc7 Merge pull request #18839 from indelog/fix_list_of_autoecmfiles 
Fix FormFile::list_of_autoecmfiles object_instance classname after hook
 2021-09-30 13:39:16 +02:00
Laurent Destailleur
ae9643bbef Update html.formfile.class.php 2021-09-30 13:38:38 +02:00
Laurent Destailleur
3deb424b4f Merge pull request #18845 from indelog/fix_doc_prev_ecm 
Fix show for external module in ecm index auto page
 2021-09-30 13:36:49 +02:00
Laurent Destailleur
98d8bad955 Merge pull request #18843 from indelog/fix_ecm_deletion 
Fix append module suffix on src_object_type when create ecm file
 2021-09-30 13:32:42 +02:00
Laurent Destailleur
4fe9a4fd30 Merge pull request #18846 from hregis/fix_avoid_warning_if_not_an_array 
FIX avoid warning if $categories is an id
 2021-09-30 13:30:37 +02:00
Laurent Destailleur
a9805fbfc1 NEW The protection MAIN_SECURITY_CSRF_WITH_TOKEN=1 is on by default 2021-09-29 17:34:31 +02:00
Marc de Lima Lucio
b0aa502ed4 NEW: deposit payment terms: set deposit percentage in proposals/orders + get from origin document or company 2021-09-29 14:51:30 +02:00
Laurent Destailleur
0f55eea276 css 2021-09-29 14:48:50 +02:00
Marc de Lima Lucio
4d6c1d892b NEW: deposit payment terms: set deposit percentage in company card 2021-09-29 14:03:35 +02:00
Marc de Lima Lucio
4b3fc4d7f3 NEW: deposit payment terms: add input in payment conditions form 2021-09-29 13:02:32 +02:00