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

96128 Commits

Author SHA1 Message Date
Laurent Destailleur
89d8fdde8d Fix phpcs 2022-04-29 19:31:59 +02:00
Laurent Destailleur
316ef3371d Fix phpcs 2022-04-29 19:30:04 +02:00
Laurent Destailleur
6a2526ae65 Responsive 2022-04-29 19:04:46 +02:00
Laurent Destailleur
0e710b05cd
Merge pull request #20667 from leninrivas/patch-3 
Show only code multicurrency in lists
 2022-04-29 18:56:11 +02:00
Laurent Destailleur
498c6a4804
Merge branch 'develop' into productinstock 2022-04-29 18:52:46 +02:00
Laurent Destailleur
18f1539015
Merge pull request #20671 from Easya-Solutions/fix-takepos-barcode-rule-get-const 
FIX get TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCE const in TakePos
 2022-04-29 18:51:02 +02:00
Laurent Destailleur
3a80ece0fd
Merge pull request #20717 from aspangaro/16a21 
FIX Check field accountancy code customer is mandatory in mass action
 2022-04-29 18:50:21 +02:00
Laurent Destailleur
38d7ab47ca
Merge pull request #20674 from aspangaro/16a22 
FIX Accountancy - Missing language key
 2022-04-29 18:36:00 +02:00
Laurent Destailleur
e5aa4afabd
Merge pull request #20683 from hregis/fix_missing_getentity 
FIX compatibility with multicompany sharings
 2022-04-29 18:35:26 +02:00
Laurent Destailleur
62529bbf1e
Merge pull request #20678 from altairis-melina/completeAjaxReturnArray 
NEW : TakePos - add hooks to complete ajax return array
 2022-04-29 18:17:47 +02:00
Laurent Destailleur
2da48cea0b
Update ajax.php 2022-04-29 18:16:48 +02:00
Laurent Destailleur
d00a4baeab
Merge pull request #20687 from fred1201/fred01dev 
Fix display in take post  when special caracter are store in database
 2022-04-29 18:02:49 +02:00
Laurent Destailleur
2676aeb93f
Merge pull request #20681 from hregis/fix_missing_hook_parameter 
FIX missing hook parameter ($possiblelinks)
 2022-04-29 18:01:32 +02:00
Laurent Destailleur
3fb081a2fc
Update contacts1.modules.php 2022-04-29 17:57:55 +02:00
Laurent Destailleur
d98637c113
Merge branch 'develop' into cleanMailingLanguageSupport 2022-04-29 17:56:56 +02:00
Laurent Destailleur
fdfde165a9 FIX #20702 #20699 #20700 2022-04-29 17:48:40 +02:00
Laurent Destailleur
801f0e62f7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-29 17:37:01 +02:00
Laurent Destailleur
49d15b691b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/expensereport/card.php
 2022-04-29 17:35:36 +02:00
Laurent Destailleur
93de425c47 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
 2022-04-29 17:32:28 +02:00
Laurent Destailleur
eb92b7a25f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-29 17:27:29 +02:00
Laurent Destailleur
17a2aa8f1b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
 2022-04-29 17:27:12 +02:00
BENKE Charlene
364799582a fix : allow cut&paste as real numeric value to excel 2022-04-29 17:24:55 +02:00
Laurent Destailleur
235edb1f70
Merge pull request #20709 from defrance/patch-183 
NEW: allow cut&paste as real numeric value to excel
 2022-04-29 17:23:56 +02:00
Laurent Destailleur
6ed0bb2924
Merge pull request #20697 from ns-info90/develop 
Update pdf_rouget.modules.php #20142
 2022-04-29 17:22:40 +02:00
Laurent Destailleur
a6f48868f1
Merge pull request #20689 from atm-gauthier/FIX/trad_expense_tax_cat_label 
FIX : label tax cat trad
 2022-04-29 17:22:15 +02:00
Laurent Destailleur
b4f6cbc64a
Merge pull request #20706 from fappels/develop_fix_migration 
Fix migration warning.
 2022-04-29 17:21:52 +02:00
Laurent Destailleur
fa8ce6e4fd
Merge pull request #20710 from fappels/develop_confirm_createbills 
Move massaction 'confirm_createbills' from actions_massactions.inc.php to commande/list.php
 2022-04-29 17:19:18 +02:00
Laurent Destailleur
38c0264971 Show warning if not journal not defined 2022-04-29 17:15:42 +02:00
Laurent Destailleur
7a440d8c73
Merge pull request #20713 from daraelmin/daraelmin-bookkeping-create-mode 
Fix #20712 - No more empty wrong line added in bookkeeping confirme_create
 2022-04-29 17:08:49 +02:00
Laurent Destailleur
e1aaeeef29 FIX #20140 #20301 2022-04-29 16:57:23 +02:00
matll42
ff35bf8d47 FIX #20476 migration postgresql 14.0.x to 15.0.x packaging type 2022-04-29 16:53:48 +02:00
Laurent Destailleur
80dce10473
Merge pull request #20714 from matll42/fix/postgresql_upgrade_15_0_1_packaging_real 
FIX #20476 migration postgresql 14.0.x to 15.0.x packaging type
 2022-04-29 16:52:30 +02:00
Laurent Destailleur
f06af016cd
Merge pull request #20720 from aspangaro/16a24 
FIX Accountancy - Export format FEC - Prevent tabbing in label with the formats for which it is the separator
 2022-04-29 16:50:51 +02:00
Laurent Destailleur
8f7239c239
Merge pull request #20723 from dolibarr95/patch-62 
NEW : Send email to the supplier order contact
 2022-04-29 16:49:09 +02:00
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
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
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
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
stickler-ci
6ab88d0169 Fixing style errors. 2022-04-28 10:09:02 +00:00
lainwir3d
f0e65e8bdd FIX #20733 Inventory: Do not use batch qty even if present if batch module is disabled. 2022-04-28 14:00:24 +04:00
Christophe Battarel
75f540c30c fix for reshook when several module use the hook but only on is concerned 2022-04-28 11:49:15 +02:00
lmarcouiller
701960bd70 try to fix build fail 2022-04-28 11:47:13 +02:00
IC-faycal
fc6228a48c NEW Events on Proposal to Return to Draft 2022-04-28 11:27:15 +02:00
Laurent Destailleur
d376d28588 Missing trans 2022-04-28 11:12:21 +02:00
Christophe Battarel
729d1f57aa fix select fields 2022-04-28 10:53:16 +02:00
lmarcouiller
be2502c29f New : module webhook database structure 2022-04-28 10:50:55 +02:00
melina
f634d7e503 fix commit 2022-04-28 08:42:44 +02:00
melina
0c8a6bd6f0 fix commit 2022-04-28 08:39:02 +02:00
Alexandre SPANGARO
1efa44a022 NEW Accountancy - Add reconcile functionality 2022-04-28 06:50:37 +02:00
Alexandre SPANGARO
5dce613118 NEW Accountancy - Product admin - Add product categories 2022-04-28 05:34:02 +02:00
Aloïs Micard
fb7f0545e4 Fix error reporting in getLinesArray() 2022-04-27 17:56:31 +02:00
dolibarr95
c969cef731
NEW : Send email to the supplier order contact 
Select the recipient defined in object contact (Vendor contact following-up order / Contact fournisseur suivi commande) in order to send email to the specific contact and not to generic company email (as for invoice/bill)
 2022-04-27 10:09:22 +02:00
Christophe Battarel
25078b292d fix hookmanager 2022-04-27 09:40:09 +02:00
dolibarr95
4939da560f
New: Add option to foce delivery receipt to yes 
Add a constant to force delivery receipt for supplier order.
 2022-04-27 09:25:38 +02:00
Christophe Battarel
543e6f186c add hook to getSellPrice function 2022-04-27 09:03:51 +02:00
Florian HENRY
8fab7bbf55 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_20652 2022-04-27 08:52:31 +02:00
Florian HENRY
dd85c22927 remove combox search box 2022-04-27 08:50:58 +02:00
Alexandre SPANGARO
3f832c1c5d FIX Accountancy - Export format FEC - Prevent tab in label with the formats for which it is the separator 2022-04-27 04:46:09 +02:00
daraelmin
5387a8e953
FiX miss spelling 2022-04-26 19:07:31 +02:00
Florian HENRY
3d4bd1e155 FIX: truncate Customer Reference too long on PDF header (PR #20718) 2022-04-26 16:53:40 +02:00
Florian HENRY
399addfb03 mor docs 2022-04-26 16:40:27 +02:00
Florian HENRY
c00a56bee3 fix: truncate too long Ref Customer in PDF Header 2022-04-26 16:39:06 +02:00
Alexandre SPANGARO
8d3c2e34f4 FIX Check field accountancy code customer is mandatory in mass action 2022-04-26 11:46:00 +02:00
matll42
8980b2e6c0 FIX #20476 migration postgresql 14.0.x to 15.0.x packaging type 2022-04-25 19:54:08 -04:00
Laurent Destailleur
134113db64 Fix upload of doc for purchase orders 2022-04-26 01:00:10 +02:00
Laurent Destailleur
8de9d63f7d FIX Numbering of sepa files 2022-04-26 00:35:20 +02:00
Laurent Destailleur
fb1c770568 Doc 2022-04-25 23:37:34 +02:00
stickler-ci
6a1d4c2255 Fixing style errors. 2022-04-25 20:36:34 +00:00
daraelmin
694bcda3bb Fix #20712 - No more empty wrong line added in bookkeeping confirme_create mode 2022-04-25 22:26:25 +02:00
stickler-ci
7f1d5fa867 Fixing style errors. 2022-04-25 12:43:58 +00:00
Francis Appels
7e44227df2 Cleanup 'confirm_createbills' 2022-04-25 14:28:57 +02:00
BENKE Charlene
752aaeb275
fix : allow cut&paste as real numeric value to excel 2022-04-25 14:07:48 +02:00
Francis Appels
40da139225 Add hook massaction to reception list. 2022-04-25 13:58:33 +02:00
Francis Appels
e9cfb9b69c Improve error handling confirm_billcreate 2022-04-25 11:24:09 +02:00
Francis Appels
e6ce81bf8b Move confirm_createbills mass action to order list 2022-04-25 11:20:00 +02:00
Regis Houssin
7e7ae863c7 FIX syntax error 2022-04-25 10:19:52 +02:00
Regis Houssin
8a2cc52b5c FIX wrong website data root with multicompany 2022-04-25 10:14:30 +02:00
Francis Appels
8bb9cc83eb Fix migration warning. 2022-04-25 09:30:05 +02:00
Laurent Destailleur
97328f732e Fix error managemnt when getting RSS. 2022-04-24 23:02:53 +02:00
Laurent Destailleur
16c607f4d8 Fix responsive 2022-04-24 18:55:52 +02:00
Nicolas SILOBRE
5eb74772d6
Update pdf_rouget.modules.php 
Correction of units in the total weight
 2022-04-23 03:41:17 +02:00
stickler-ci
9fd3a4b2c9 Fixing style errors. 2022-04-22 13:30:43 +00:00
Eric Seigne
72ac1fdfd2 fix #20690: add lang filter for companies 2022-04-22 15:28:48 +02:00
Eric Seigne
d2ec1efb42 fix #20690: add lang filter for people 2022-04-22 15:28:36 +02:00
Gauthier PC portable 024
6f9f78af33 FIX : var name 2022-04-22 14:28:43 +02:00
Gauthier PC portable 024
609ef9bfa7 FIX : var name 2022-04-22 14:26:16 +02:00
Gauthier PC portable 024
ca0f98d09f FIX : label tax cat trad 2022-04-22 13:50:39 +02:00
lvessiller
2992b3e845 NEW send last document in mass mailing action 2022-04-22 09:24:23 +02:00
Regis Houssin
2a5c54d4e4 FIX compatibility for ticket number sharing 2022-04-21 16:02:41 +02:00
Regis Houssin
8878eb6d76 FIX compatibility with multicompany sharings 2022-04-21 14:52:06 +02:00
Regis Houssin
731d85130c FIX missing hook parameter 2022-04-21 09:49:00 +02:00
fred1201
d9521d40e4 Update index.php 
Replace call function
text( ) by html() to fix display in take post  when spécial caracter are store in database:

&eacute;&egrave;&agrave; become éàè
 2022-04-21 07:39:51 +02:00
melina
db3edba578 Delete comments 2022-04-20 14:51:55 +02:00
melina
c23ed7c47b Add hooks completeJSProductDisplay 2022-04-20 14:47:36 +02:00
melina
6788cd179c Add hooks completeAjaxReturnArray 2022-04-20 12:01:17 +02:00
altairis-melina
ea2e1c0ff2
Merge branch 'develop' into productinstock 2022-04-20 09:59:10 +02:00
melina
0faec59f56 FIX conflict and integrate Lionel fix 2022-04-20 08:13:01 +02:00
Laurent Destailleur
ad7fcd264b FIX Tabulation must be allowed for HTML content 2022-04-19 23:39:09 +02:00
Laurent Destailleur
307476786c Fix label of remain to pay on vendor invoices 
FIX tool to fix bank account not in main currency for vendor invoice
 2022-04-19 23:24:08 +02:00
Alexandre SPANGARO
1e96cd636f FIX Accountancy - Missing language key 2022-04-19 22:38:42 +02:00
Laurent Destailleur
aa86b2c71f Fix root passfield not editable on install 
Fix user photo when gravatar not reachable
 2022-04-19 22:26:27 +02:00
lvessiller
68cfe61fb8 FIX get TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCE const in TakePos 2022-04-19 17:59:59 +02:00
stickler-ci
aa36e396a3 Fixing style errors. 2022-04-18 22:23:44 +00:00
Yoan Mollard
37ab728846 Allow users to switch on e-mail headers again in UI 2022-04-19 00:13:40 +02:00
Yoan Mollard
bf5076e181 set MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER to TRUE by default 
This is way more readable
 2022-04-19 00:13:40 +02:00
Yoan Mollard
d5361c3147 Improved default signature for tickets 2022-04-19 00:13:40 +02:00
Yoan Mollard
cbdf74e00c i18n the default email collector descriptions 2022-04-19 00:13:40 +02:00