Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-13 13:01:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
88,321 Commits 36 Branches 190 Tags
16b69a069e64efb66d952f55ffa9b0f8db85f54d
Commit Graph

8329 Commits

Author SHA1 Message Date
Tim Otte
16b69a069e Fixed sql error where column names were used instead of sql column names 2020-11-30 10:21:10 +01:00
Laurent Destailleur
6fd433167f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2020-08-07 11:59:55 +02:00
florian HENRY
46cafcc445 Merge branch '11.0' into 12.0 2020-08-06 16:54:49 +02:00
florian HENRY
3e6ae9bebf Merge branch '10.0' into 11.0 2020-08-06 16:34:45 +02:00
florian HENRY
53acd8cffd FIX: MAIN_MAIL_FORCE_SENDTO work now for all mail sending method 2020-08-06 16:28:17 +02:00
Laurent Destailleur
1f02b33195 Work on inventory 2020-08-05 12:25:26 +02:00
Laurent Destailleur
4c1aa25b32 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/admin/adherent_emails.php
	htdocs/core/tpl/extrafields_list_search_title.tpl.php
	htdocs/product/traduction.php
 2020-08-04 13:51:11 +02:00
Laurent Destailleur
2076d18825 FIX Param of fetch_name_optionals_label must be object->table_element 2020-08-04 12:47:09 +02:00
Tim Otte
0e03578e91 Fixed translation of product units in documents 2020-08-04 11:51:40 +02:00
Laurent Destailleur
e455f8afa6 Merge pull request #14369 from Tim-Otte/fix-product-unit-translation 
Fixed translation of product units in documents
 2020-08-04 11:50:50 +02:00
Tim Otte
360afccecc Fixed translation of product units in documents 2020-08-04 11:02:16 +02:00
VERDOL Gauthier
2d192431bc FIX : wrong element var for fetch_name_optionals_label function with expeditions 2020-08-03 14:59:51 +02:00
Laurent Destailleur
fb811a1656 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/database-tables.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/langs/fr_FR/withdrawals.lang
	htdocs/societe/class/societe.class.php
 2020-08-03 14:44:01 +02:00
Laurent Destailleur
defbd26f95 Help to fight errors ErrorBadValueForParamNotAString 2020-08-03 12:33:22 +02:00
Laurent Destailleur
c2bb0431f0 FIX input field of extrafields must keep data if form submit fails. 2020-08-03 12:31:30 +02:00
Laurent Destailleur
d59bcd3f5b FFIX error creating record when extrafields price exists in other entity 2020-08-03 12:08:33 +02:00
Laurent Destailleur
7297950308 Merge pull request #13759 from OPEN-DSI/stcommcontact 
NEW: Add prospect status managment for the contact with managment of custom icon
 2020-08-02 22:01:00 +02:00
Laurent Destailleur
7149cbb532 NEW Add public note on products. This also partially fix the #14342 2020-08-02 17:09:21 +02:00
Laurent Destailleur
be34a2c607 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/cashdesk.lang
	htdocs/product/stock/list.php
 2020-08-02 16:06:51 +02:00
Laurent Destailleur
ecfdb4bbac Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-02 16:02:09 +02:00
Laurent Destailleur
5e6254634f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-02 16:01:13 +02:00
Laurent Destailleur
1edfa4a4fb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2020-08-02 16:01:03 +02:00
Laurent Destailleur
8c4b4e233d Merge pull request #14317 from fappels/12_show_virtual_stock 
Fix hidden option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO
 2020-08-02 01:32:18 +02:00
kkhelifa-opendsi
fe0f77b967 Merge branch 'develop' into stcommcontact 2020-07-31 16:41:17 +02:00
Laurent Destailleur
d4e21538db FIX Debug setup of receipt printer module 2020-07-31 13:40:36 +02:00
altairis
9a9eef428b fix duration fields size with firefox 2020-07-31 12:22:21 +02:00
Laurent Destailleur
0bf678e09e Fix label of extrafields 2020-07-30 14:57:33 +02:00
Laurent Destailleur
8b879ee23b FIX Edit extrafield of type long text loose carriage returns 2020-07-30 14:49:00 +02:00
Francis Appels
54410189bc Fix hidden option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO 
When product ajax search used a dash is show, so virtual stock looks like being negative value.
 2020-07-29 17:00:39 +02:00
Laurent Destailleur
3d79950c27 Update commonobject.class.php 2020-07-29 14:13:29 +02:00
Laurent Destailleur
91a50038ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/fiche-stat.php
 2020-07-27 19:35:34 +02:00
Laurent Destailleur
714481f7e5 FIX Navigation in object fails to find the next ref in some cases 2020-07-26 21:08:31 +02:00
Laurent Destailleur
a2dd80bcc8 FIX Navigation in object fails to find the next ref in some cases 2020-07-26 21:07:39 +02:00
Laurent Destailleur
b63a6bc72a NEW Can use dynamic code into the 'enabled' property of DAO fields 2020-07-26 20:45:54 +02:00
Laurent Destailleur
f68be08c67 Merge pull request #14198 from Gecka-Apps/12.0-printStdColumnContent-hook-improve 
Improve printStdColumnContent by passing the $pdf object
 2020-07-24 13:20:03 +02:00
Laurent Destailleur
42234ba506 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/price.lib.php
 2020-07-24 00:07:57 +02:00
quentin
255bd6b26c FIX null required 2020-07-22 11:54:52 +02:00
Laurent Dinclaux
3cdabbaaff Explicitly pass the pdf object by reference in the printStdColumnContent hook call. 2020-07-19 21:53:06 +11:00
Laurent Destailleur
cbc8187616 Merge pull request #14205 from Gecka-Apps/12.0-fix-extra-field-ordering 
Fix extrafields ordering on PDFs
 2020-07-18 19:30:34 +02:00
Laurent Destailleur
0d24b979c1 Fix phpcs 2020-07-11 01:20:20 +02:00
Laurent Destailleur
bb056fc811 Fix bad return value 2020-07-10 03:02:49 +02:00
Laurent Destailleur
f2c84fba3d Merge pull request #14202 from pstructures/PSdevelop 
Added Hook to showOptionals Function
 2020-07-10 02:54:05 +02:00
Laurent Destailleur
96c583b84e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-10 02:28:34 +02:00
Laurent Destailleur
87913e8a5c Fix prospect before customer 2020-07-10 02:11:23 +02:00
Laurent Destailleur
b8721e0c64 FIX Change position of line in BOM 2020-07-09 16:00:15 +02:00
Laurent Dinclaux
6ed2ae188e Fix extrafields ordering on PDFs 2020-07-10 00:51:41 +11:00
Matt Sidnell
39104009ef Updated to match inline with code received from fork 2020-07-08 14:25:37 +01:00
Matt Sidnell
580b9db3e7 Updated Hook in showOptionals function to allow the manipulation of optional fields on cards etc... 2020-07-08 14:20:59 +01:00
Laurent Dinclaux
37401df106 Improve printStdColumnContent by passing the $pdf object. 
It isn't possible to replace the pdf edition done by this method without the $pdf object.
 2020-07-08 14:48:34 +11:00
Laurent Destailleur
70c3146aba Merge pull request #14106 from OPEN-DSI/new-extrafields-category-multi-select-with-link 
NEW show links for select and multi-select in category extra field
 2020-07-06 12:12:31 +02:00