2
0
forked from Wavyzz/dolibarr
Commit Graph

108518 Commits

Author SHA1 Message Date
Laurent Destailleur
bc03658f18 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-04-29 16:42:43 +02:00
Laurent Destailleur
67048cd2c6 Merge pull request #20721 from altairisfr/getsellprice
NEW : add hook to getSellPrice function
2022-04-29 16:39:30 +02:00
Laurent Destailleur
7b509706b6 Merge pull request #20722 from dolibarr95/patch-61
NEW: Add option to foce delivery on email for purchase order receipt to yes
2022-04-29 16:37:58 +02:00
Laurent Destailleur
9729918101 Merge pull request #20728 from aspangaro/16a25
NEW Accountancy - Product admin - Add product categories
2022-04-29 16:36:34 +02:00
Laurent Destailleur
7616a55de5 Merge pull request #20726 from vold-lu/fixes/lines-array-error-reporting
FIX: ModuileBuilder - Fix getLinesArray() error reporting
2022-04-29 16:35:16 +02:00
Laurent Destailleur
fbfb003c9b Merge pull request #20731 from altairisfr/fixtakepos
FIX TakePos - fix select fields
2022-04-29 16:30:20 +02:00
Laurent Destailleur
9e23b30728 Fix remove useless file 2022-04-29 16:22:04 +02:00
Laurent Destailleur
47661d8d38 Merge pull request #20735 from atm-john/13.0_fix_missing_budget_export
Fix :  missing project budget field in Dolibarr V13 export wizard
2022-04-29 16:06:30 +02:00
Laurent Destailleur
4a8864ed63 Merge pull request #20739 from lainwir3d/inventories_fix_movement_display
FIX #20738 Inventory: Add missing <td....> for movement number / card.
2022-04-29 16:06:07 +02:00
Laurent Destailleur
5817c1f1b7 Update inventory.php 2022-04-29 16:05:52 +02:00
Laurent Destailleur
659f520365 Merge pull request #20740 from inovea-conseil/event_propal_return_to_draft
NEW Events on Proposal to Return to Draft
2022-04-29 16:04:26 +02:00
Laurent Destailleur
3dd90ecf41 js escape 2022-04-29 16:02:05 +02:00
Laurent Destailleur
cc55b4444f Merge pull request #20746 from altairisfr/pagin
NEW TakePos - pagination on search results
2022-04-29 15:59:50 +02:00
Laurent Destailleur
a8a6710feb Merge pull request #20747 from Quentin-Seekness/patch-2
FIX: Delete an extrafield where type is double
2022-04-29 15:55:49 +02:00
Laurent Destailleur
223db9bb76 Fix: Not SetEventMessages inside a CRUD class. 2022-04-29 14:32:47 +02:00
Laurent Destailleur
921aabfc54 Look and feel v16 2022-04-29 14:11:38 +02:00
Laurent Destailleur
8ad57b3d7a Fix td 2022-04-29 13:43:51 +02:00
Laurent Destailleur
fed14db94a css 2022-04-29 13:22:46 +02:00
Laurent Destailleur
3780e83615 Trans 2022-04-29 13:20:14 +02:00
Laurent Destailleur
147e61472c Clean code: Remove all &ensp; entities. 2022-04-29 13:10:28 +02:00
Laurent Destailleur
708d3610a5 Look and feel v16 2022-04-29 13:04:29 +02:00
Laurent Destailleur
bdd9b2acf4 Clean css 2022-04-29 12:36:38 +02:00
Laurent Destailleur
d496ad65e6 Enhance the feature of keyword detection for partnership 2022-04-29 11:16:15 +02:00
Christophe Battarel
d682cb3103 please Travis 2022-04-29 11:09:32 +02:00
Christophe Battarel
812b9adee7 still trying to please Travis... losing my time 2022-04-29 10:58:04 +02:00
Quentin-Seekness
726b899d30 FIX: Delete an extrafield where type is double
Found the bug on a propal's extrafield, it was impossible to delete a decimal extrafield.  In updateExtraField() the $value stayed "" where it needed to be null.
The same issue can be found in insertExtraFields().
2022-04-29 10:45:08 +02:00
melina
407efccd55 Merge branch 'productinstock' of github.com-melina:altairis-melina/dolibarr into productinstock 2022-04-29 10:44:15 +02:00
melina
6d79d03cb2 add comment to fix stickler 2022-04-29 10:43:35 +02:00
Christophe Battarel
a11b5b4399 escape sql string for my Travais friend 2022-04-29 10:12:53 +02:00
Christophe Battarel
fb076a9282 FIX pagination on search results 2022-04-29 10:00:25 +02:00
Christophe Battarel
78f46bb98b search next or previous page of products if asked 2022-04-29 09:49:10 +02:00
Christophe Battarel
accb900d4f ajax load only one page of search results 2022-04-29 09:45:36 +02:00
Laurent Destailleur
a5379043e9 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-28 22:37:52 +02:00
Laurent Destailleur
822a0a37f3 Fix phpunit 2022-04-28 22:37:21 +02:00
Laurent Destailleur
a129b6d132 FIX phpcs 2022-04-28 22:29:48 +02:00
lainwir3d
3b98f74a56 Fix typo and switch to old join style. 2022-04-28 22:56:44 +04:00
Laurent Destailleur
40d0c3b996 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/tva/card.php
	htdocs/langs/en_US/admin.lang
2022-04-28 19:23:13 +02:00
Laurent Destailleur
559694dd4f API doc 2022-04-28 19:05:23 +02:00
Laurent Destailleur
93815404a2 Fix phpcs 2022-04-28 18:46:52 +02:00
Laurent Destailleur
ebe68350d1 IP for last and previous login is now saved inuser table 2022-04-28 17:34:04 +02:00
Alexandre SPANGARO
7752c5f122 Comment function 2022-04-28 17:24:10 +02:00
Alexandre SPANGARO
f2d81f97b9 Comment function 2022-04-28 17:10:30 +02:00
stickler-ci
96e247bf89 Fixing style errors. 2022-04-28 13:55:54 +00:00
Alexandre SPANGARO
5cc1aba0f5 Merge branch '16a26-Accountancy_reconcile' of https://github.com/aspangaro/dolibarr into 16a26-Accountancy_reconcile 2022-04-28 15:50:16 +02:00
Alexandre SPANGARO
5379db7c6b Fix stickler-ci 2022-04-28 15:49:08 +02:00
stickler-ci
68864840b6 Fixing style errors. 2022-04-28 13:25:50 +00:00
Alexandre SPANGARO
f54501c9e4 Merge remote-tracking branch 'upstream/develop' into 16a26-Accountancy_reconcile 2022-04-28 15:20:05 +02:00
lainwir3d
88bd28323c FIX #20738 Inventory: Add missing <td....> for movement number / card. 2022-04-28 16:46:42 +04:00
lainwir3d
b35b40649f CLOSE #20736 Allow extrafields SQL filters on REST API product lookup 2022-04-28 15:48:07 +04:00
John BOTELLA
900caf5a44 Fix missing budget export 2022-04-28 12:12:20 +02:00