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

101678 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
e558adbcfc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-03 18:20:34 +02:00
Laurent Destailleur
d6e1a6be93 Look and feel v14 2021-10-03 18:20:01 +02:00
Laurent Destailleur
4c6f2fc4b5
Merge pull request #18874 from OPEN-DSI/v14-fix-product-per-entity-portability-sql 
FIX Product accountancy affectation with product_perentity activated …
 2021-10-02 21:04:11 +02:00
Laurent Destailleur
c149af82fe
Merge pull request #18873 from JR-Polyline/patch-1 
Fix dynamic prices not updating
 2021-10-02 20:45:16 +02:00
Laurent Destailleur
d99b3d601a FIX #18854 2021-10-02 20:07:09 +02:00
lvessiller
fd7d1374c2 FIX Product accountancy affectation with product_perentity activated (PR #18620) 2021-10-01 16:37:54 +02:00
JR-Polyline
2be2423dee
Fix dynamic prices not updating 
When Dynamic price module active and an a math expression is used to compute buy price on supplier product card, the calculated price does not update on the card when saved.
Changing line 849 appears to solve this without any ill effect.
 2021-10-01 21:30:25 +08:00
Laurent Destailleur
d68719226b Fix can install module with name module_abc-x.y.z (w).zip 2021-10-01 14:10:50 +02:00
Laurent Destailleur
166d3b08d6 Add LIBXML_NONET to simplexml_load_string 2021-09-30 20:12:01 +02:00
Laurent Destailleur
0bf1db2fd4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-30 16:29:10 +02:00
Laurent Destailleur
ed264182c6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
	htdocs/takepos/receipt.php
 2021-09-30 16:28:42 +02:00
Laurent Destailleur
44bb5ebf34 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2021-09-30 16:23:34 +02:00
Laurent Destailleur
bb6399e12a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
 2021-09-30 16:21:36 +02:00
Laurent Destailleur
fc4a16b356 Fix avoid error when trigger run on downgraded version. 2021-09-30 16:18:07 +02:00
Laurent Destailleur
422191def1
Merge pull request #18858 from FHenry/12_fix_dict_tva 
fix: search code on tva dict
 2021-09-30 14:05:07 +02:00
Laurent Destailleur
620d7109b5
Update dict.php 2021-09-30 14:04:56 +02:00
Florian HENRY
332fa77d90 fix: search code on tva dict 2021-09-30 13:49:02 +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
Norbert Penel
4e86f872ca it was impossible to update a task 
after some investigation i saw those errors but they are maybe some more around here
 2021-09-30 13:35:23 +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
04fa5ff70b css 2021-09-30 01:50:11 +02:00
Laurent Destailleur
fca39d9179 css 2021-09-30 01:15:36 +02:00
Laurent Destailleur
3d239e7528 Trans 2021-09-29 17:28:06 +02:00
Laurent Destailleur
11c48a53a5 Fix name of file 2021-09-29 17:20:59 +02:00
Laurent Destailleur
a495d5e982 Fix translation 2021-09-29 17:14:37 +02:00
Laurent Destailleur
2dd55301de Fix duplicate field and look and feel 2021-09-29 17:06:51 +02:00
Laurent Destailleur
52fb627a64 Look and feel v14 2021-09-29 16:45:48 +02:00
Laurent Destailleur
1d35d8fd2d CSS popup company 2021-09-29 16:42:52 +02:00
Laurent Destailleur
34dacca77c Css 2021-09-29 16:31:40 +02:00
Laurent Destailleur
a395ff5ee3 Css 2021-09-29 16:19:47 +02:00
Laurent Destailleur
10ea7ddeef Fix link param 2021-09-29 12:31:25 +02:00
Regis Houssin
6e08ecde04 FIX indentation 2021-09-29 08:47:22 +02:00
Laurent Destailleur
baadf2dc6c Fix reposition 2021-09-29 01:51:34 +02:00
Laurent Destailleur
1e840fe7ed Code comment 2021-09-28 18:07:04 +02:00
Regis Houssin
43a47999d7 FIX avoid warning if $categories is an id 2021-09-28 16:35:01 +02:00
Indelog
fae0337b3e Fix show for external module in ecm index auto page 
This set the correct `modulepart` parameter for link generated to
`document.php` of ecm auto index page if `src_object_type` for
ecm document has a module suffix (`@modulename`).
 2021-09-28 16:22:28 +02:00
Indelog
5b8b55cfba Fix append module suffix on src_object_type when create ecm file 
Files added to `llx_ecm_files` for externals modules never be removed on
object deletion.

When `CommonObject::deleteEcmFiles()` is called with `mode=1`, it  use
this sql filter to find the file related to the object which is removed
:

```
$sql .= " WHERE fk_object IN (SELECT rowid FROM ".MAIN_DB_PREFIX."ecm_files WHERE src_object_type = '".$this->db->escape($this->table_element.(empty($this->module) ? '' : '@'.$this->module))."' AND src_object_id = ".((int) $this->id).")";
```

We see it append `'@'.$this->module` to `$this->table_element` but when
file is add to the `llx_ecm_files` by
`CommonObject::commonGenerateDocument()` , it added whiteout the
`'@'.$this->module` suffix. So the file is never remove from
`llx_ecm_files` when object is deleted.

This fix it by appending module suffix on `src_object_type` if object
has `module` property when add document to the `llx_ecm_files`.
 2021-09-28 15:26:08 +02:00
Laurent Destailleur
abc7137c81 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-28 13:45:05 +02:00
Laurent Destailleur
fc56b88a1f FIX select list of orders not complete when field type of company is on 2021-09-28 13:44:42 +02:00
Laurent Destailleur
d7986fafbc
Merge pull request #18810 from aspangaro/14p16 
FIX Accountancy - Missing specific filename for export on format FEC2
 2021-09-28 13:20:33 +02:00
Alexandre SPANGARO
9426af8f6a NEW #18820 Accountancy - Add product account in import/export of thirdparty (level 3) 2021-09-28 13:16:44 +02:00
Laurent Destailleur
21fa60a730 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-28 13:08:03 +02:00
Laurent Destailleur
e6290b3b62
Merge pull request #18836 from aspangaro/14p22 
FIX Propal list - Problem of pagination on date
 2021-09-28 12:17:22 +02:00
Laurent Destailleur
c3d539abff
Merge pull request #18833 from marc-dll/12.0_FIX_product_extrafields_update 
FIX: products/services card: hidden extrafields were overridden
 2021-09-28 12:13:08 +02:00
Laurent Destailleur
a70f5dd90e Doc 2021-09-28 12:12:11 +02:00
Indelog
2472dff67b Fix FormFile::list_of_autoecmfiles object_instance classname after hook 
FormFile::list_of_autoecmfiles() can instantiate object with parameters
resulting of hook `addSectionECMAuto` but for do this,
it use `${$hookmanager->resArray['classname']}` which return a
`null`. Instead we should do this
`$hookmanager->resArray['classname']`.
 2021-09-28 12:08:45 +02:00
Laurent Destailleur
0e3ec3ea2d Trans 2021-09-28 11:56:43 +02:00