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

96514 Commits

Author SHA1 Message Date
Laurent Destailleur
775a8c5334 Look and feel v16 2022-05-12 20:18:58 +02:00
lvessiller
94dcee622b FIX stickler 2022-05-12 17:58:31 +02:00
lvessiller
0a5b2097e7 FIX resolve conflicts 2022-05-12 17:07:23 +02:00
lvessiller
7c17f6b1cf NEW create third-party with contact if not found on public ticket 2022-05-12 16:52:02 +02:00
Laurent Destailleur
a787fc178b Fix language 2022-05-12 15:27:41 +02:00
Laurent Destailleur
7a361a3bde More info to help debug 2022-05-12 14:28:17 +02:00
Laurent Destailleur
85cddf638f Fix can fix a corrupted lost bank account on bank account lines 2022-05-12 11:06:22 +02:00
Laurent Destailleur
1768c3d926 Code more robust when fk_account has been corrupted 2022-05-12 10:48:34 +02:00
Laurent Destailleur
c46303c0e6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-12 10:47:31 +02:00
Laurent Destailleur
dc6f90c4a7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-12 10:38:26 +02:00
Laurent Destailleur
fc33aa854e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-12 10:37:18 +02:00
Laurent Destailleur
88a9b8c201 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-12 10:37:08 +02:00
Laurent Destailleur
de19783f19 Fix log 2022-05-12 10:36:18 +02:00
Laurent Destailleur
4e87e47451 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-05-12 10:35:00 +02:00
Laurent Destailleur
62005e1502 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-12 02:19:54 +02:00
Laurent Destailleur
43e7da685b NEW Add more fields to detect duplicate for import of thirdparties 2022-05-12 02:19:31 +02:00
Laurent Destailleur
3be2993dc2
Merge pull request #20818 from Hystepik/develop#3 
NEW : Import with select boxes V2
 2022-05-12 02:04:52 +02:00
Laurent Destailleur
6fc131b483 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-12 02:03:17 +02:00
Laurent Destailleur
0bd5fe32bd
Merge pull request #20827 from Hystepik/develop#1 
Fix : adherent module agenda create backtopage
 2022-05-12 02:02:51 +02:00
Laurent Destailleur
9ec23c7073 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-12 02:02:36 +02:00
Laurent Destailleur
a261b05866
Merge pull request #20825 from Easya-Solutions/fix-incoterms-dictionary-table-name 
FIX dictionary table name in incoterms for Debug v16
 2022-05-12 02:02:20 +02:00
Laurent Destailleur
f22661efd7
Merge pull request #20823 from Easya-Solutions/fix-ticket-dictionnry-table-name 
FIX dictionary table name in ticket for Debug v16
 2022-05-12 02:02:10 +02:00
Laurent Destailleur
7f1e8384dc Clean code 2022-05-12 02:02:04 +02:00
Laurent Destailleur
1c2e29fac8
Merge pull request #20830 from atm-quentin/FIX_missing_hook_for_row_ordering 
Fix missing hook for row ordering
 2022-05-12 01:56:55 +02:00
Laurent Destailleur
bffcb42ef9
Merge pull request #20831 from atm-gauthier/NEW/can_update_rank_on_api_put_function 
NEW Can update rank of invoice, proposal and order lines with API update
 2022-05-12 01:56:21 +02:00
Laurent Destailleur
f8654072da
Merge pull request #20832 from atm-lena/develop_NEW_ForceToWarehouse_moproduction 
New "force to"  for mo consumption
 2022-05-12 01:54:49 +02:00
Laurent Destailleur
c08595866f
Merge branch 'develop' into burundi_support_for_dolibarr_13 2022-05-12 01:51:17 +02:00
Laurent Destailleur
5c620c0071
Merge pull request #20829 from Hystepik/develop#5 
fix php 8.0 warnings
 2022-05-12 01:48:37 +02:00
Laurent Destailleur
162bb2c9df
Merge pull request #20833 from atm-john/15.0_fix_formsetup 
Fix missing array managements for form setup class
 2022-05-12 01:45:21 +02:00
Laurent Destailleur
91110b938e Fix bad db var 2022-05-12 01:38:46 +02:00
Laurent Destailleur
23b1658081 Fix null object 2022-05-12 01:37:20 +02:00
Laurent Destailleur
bf8ba511cb Fix missing index.php file on "regenerate all files" button for alt lang 2022-05-12 01:28:20 +02:00
John BOTELLA
dcd5cfe190 Fix missing array managements 2022-05-11 18:05:06 +02:00
stickler-ci
2d1615de27 Fixing style errors. 2022-05-11 15:22:16 +00:00
stickler-ci
f70a9ad04c Fixing style errors. 2022-05-11 13:42:27 +00:00
Gauthier PC portable 024
bc6cd8cc1c NEW : update rank line is possible on API for customer invoices 2022-05-11 15:34:16 +02:00
Quentin VIAL-GOUTEYRON
5d50a0e9d1 move row object 2022-05-11 15:19:50 +02:00
Quentin VIAL-GOUTEYRON
270ce3d169 FIX missing hook for row ordering 2022-05-11 15:07:39 +02:00
lmarcouiller
207ebc9266 fix php 8.0 warnings 2022-05-11 15:06:11 +02:00
Gauthier PC portable 024
da2a8a59f3 Merge branch '14.0_NEW_rang_on_api_put_line' of github.com:atm-gauthier/dolibarr into NEW/can_update_rank_on_api_put_function 2022-05-11 14:38:16 +02:00
Gauthier PC portable 024
b053dee279 NEW : update rank line is possible on API for orders propal and supplier invoice 2022-05-11 14:26:21 +02:00
atm-lena
1555a6540b Translation 2022-05-11 12:40:51 +02:00
atm-lena
e716c9abd6 Force to warehouse for consume produt in mo 2022-05-11 12:38:24 +02:00
lmarcouiller
fc9c2295c0 Fix : adherent module agenda create backtopage 2022-05-11 11:38:44 +02:00
Thomas Negre
bdb7ba5eaa fix extrafields not being kept on ticket creation 2022-05-11 11:37:02 +02:00
Laurent Destailleur
a526021459 Better size 2022-05-11 11:30:20 +02:00
lvessiller
aed0296ae2 FIX dictionary table name in incoterms for Debug v16 2022-05-11 11:08:53 +02:00
lvessiller
cdf9b89c0a FIX dictionary table for Debug v16 2022-05-11 10:51:43 +02:00
Laurent Destailleur
c5a4877eb8 php8 2022-05-11 10:28:12 +02:00
Laurent Destailleur
da5cf74a08 Fix total 2022-05-11 10:17:56 +02:00
Laurent Destailleur
e7ab9a3545 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-05-11 10:06:01 +02:00
Laurent Destailleur
9e2665fc66 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-11 10:05:35 +02:00
Laurent Destailleur
23665c3f6b Tooltip 2022-05-11 10:02:59 +02:00
Laurent Destailleur
ea0d6b1867 css 2022-05-11 10:00:37 +02:00
Laurent Destailleur
1c4c7201fc Trans 2022-05-11 09:53:23 +02:00
kamel
aee6f408b2 FIX: Set datec when add time spent on a project task 2022-05-11 09:30:39 +02:00
Eric Seigne
6d4455ec17 burundi profId mapping 2022-05-10 23:48:07 +02:00
Eric Seigne
b8e73b4b72 burundi companies type 2022-05-10 23:47:49 +02:00
Eric Seigne
7aad16bc80 burundi currencie 2022-05-10 23:47:36 +02:00
Eric Seigne
99225dab9f burundi departements (Communes) 2022-05-10 23:47:22 +02:00
Eric Seigne
4d759c23b3 burundi : regions (provinces) 2022-05-10 23:47:04 +02:00
Laurent Destailleur
fef6b159bd
Merge pull request #20798 from atm-kevin/FIX_Trigger_SetProject 
FIX : Trigger on commonObject setProject
 2022-05-10 19:30:14 +02:00
Laurent Destailleur
c4f4754b5b Add option EMAIL_ALTERNATIVE_HOST_SIGNATURE 2022-05-10 19:23:30 +02:00
Laurent Destailleur
2dc97ac3ae Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2022-05-10 17:16:11 +02:00
Laurent Destailleur
af4e9b7510 Debug v16 2022-05-10 17:05:39 +02:00
Laurent Destailleur
1f59e329cd Work on public form for partnership 2022-05-10 16:50:33 +02:00
Laurent Destailleur
3a5fe5063d Debug v16 2022-05-10 16:19:00 +02:00
Laurent Destailleur
7b21e0b6ff Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-10 16:06:32 +02:00
Laurent Destailleur
8fe5dea6e8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-10 16:04:38 +02:00
Laurent Destailleur
c9a0dd327f Fix default value 2022-05-10 16:04:20 +02:00
Laurent Destailleur
fea6771a7a Module Partnership is stable 2022-05-10 15:57:52 +02:00
lmarcouiller
7e439a8248 add of selectimportfieldsource in lang 2022-05-10 15:50:01 +02:00
kevin
a10e8c3696 Remove method Ticket::setProject because method already defined into parent CommonObject 2022-05-10 15:44:41 +02:00
kevin
f28dd2827b Update Ticket::setProject method signature 2022-05-10 15:41:38 +02:00
kevin
76b0deefb3 Merge branch 'develop' of github.com:Dolibarr/dolibarr into FIX_Trigger_SetProject 2022-05-10 15:41:06 +02:00
Laurent Destailleur
8ef75ecc7c Better fix fox #20807 2022-05-10 15:27:43 +02:00
Laurent Destailleur
a788597723
Merge pull request #20813 from Easya-Solutions/new-ticket-send-message-uncheck-private-message 
NEW uncheck send message when private message is checked
 2022-05-10 14:49:15 +02:00
Laurent Destailleur
fff9a692b4
Merge pull request #20816 from hregis/fix_missing_loading_global_conf 
FIX missing loading of global conf (avoid warning)
 2022-05-10 14:47:56 +02:00
Laurent Destailleur
02bad082d6
Merge pull request #19383 from atm-gauthier/NEW/accountancy_massaction_preselect_account_customer_and_supplier_list 
NEW : accountancy massaction preselect account (customer and supplier list)
 2022-05-10 14:45:35 +02:00
Laurent Destailleur
628554caf4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-10 14:38:52 +02:00
Laurent Destailleur
91d539bbef Clean code of not used method 2022-05-10 14:38:40 +02:00
Regis Houssin
8692038be2 FIX missing loading of global conf 2022-05-10 14:06:27 +02:00
Regis Houssin
6f8eef9550 FIX missing executeHooks 2022-05-10 12:56:22 +02:00
lmarcouiller
ed13280ea1 fix bug in select boxes 2022-05-10 12:15:52 +02:00
lvessiller
419fd94025 NEW uncheck send message when private message is checked 2022-05-10 12:08:23 +02:00
Laurent Destailleur
1e8547dd44
Merge pull request #20650 from bb2a/Move-checkbox-column-as-first-column-on-Thirdparty-list 
NEW - Move checkbox column as first column on Thirdparty list
 2022-05-10 12:00:13 +02:00
Laurent Destailleur
218749ead4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-05-10 11:52:22 +02:00
Laurent Destailleur
3271522971
Merge pull request #20790 from altairis-melina/empty_search 
NEW : TakePos - Empty search results when emptying search term
 2022-05-10 11:42:00 +02:00
Laurent Destailleur
bfa19bc065
Merge pull request #20797 from altairis-melina/hookaddline 
add hook for takepos addline
 2022-05-10 11:41:22 +02:00
Laurent Destailleur
e3ff7b43ab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-05-10 11:39:55 +02:00
Laurent Destailleur
f9f8896921 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-10 11:39:14 +02:00
Laurent Destailleur
fc718e68ee css 2022-05-10 11:38:56 +02:00
Laurent Destailleur
1b82340e1b
Merge pull request #20785 from aspangaro/16a29-Fixcustomerdeposit 
FIX Accountancy - Add an option to disable use of sub-account on deposit line
 2022-05-10 11:37:24 +02:00
Laurent Destailleur
54e149b959
Merge pull request #20810 from FHenry/15.0_fix_filename_lenght 
fix: limit filename lenght to show glasses into document boxes
 2022-05-10 11:32:08 +02:00
Laurent Destailleur
44e7496ef3
Merge pull request #20811 from ibuiv/allow-retrocession2 
add hidden option SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDE…
 2022-05-10 11:11:13 +02:00
Laurent Destailleur
7c0c56bf7b css 2022-05-10 11:07:29 +02:00
Laurent Destailleur
c2143e01ee Merge branch 'fixes/formconfirm-pass-action' of 
https://github.com/vold-lu/dolibarr into
vold-lu-fixes/formconfirm-pass-action

# Conflicts:
#	htdocs/core/class/html.form.class.php
 2022-05-10 11:07:16 +02:00
Laurent Destailleur
2e6f4862f9 Fix creation of thirdparty when module supplier not enabled 
NEw can use the clicktoclipboard feature when clicking on value
 2022-05-10 10:57:51 +02:00
Aloïs Micard
80ed7af114 formConfirm: pass action even when not confirming 2022-05-10 10:18:53 +02:00
Laurent Destailleur
cffec01451 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
	test/phpunit/SecurityTest.php
 2022-05-09 22:04:36 +02:00
Laurent Destailleur
ef18456724 Fix regression in dol_eval 2022-05-09 21:56:21 +02:00
amarchal
d21f5eca83 add hidden option SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN 2022-05-09 20:13:06 +02:00
Laurent Destailleur
d0c95d87af Debug v16 2022-05-09 18:59:11 +02:00
Laurent Destailleur
32a1c20154 Fix phpcs 2022-05-09 17:33:45 +02:00
Laurent Destailleur
779b75bf65 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
 2022-05-09 16:53:53 +02:00
Laurent Destailleur
0cac14c82f Fix trans 2022-05-09 16:51:31 +02:00
Laurent Destailleur
b3bfe22f58 FIX Error management 2022-05-09 16:45:57 +02:00
Laurent Destailleur
370f090403 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-09 16:43:05 +02:00
Laurent Destailleur
43e1486dbb FIX No empty line inserted into accounting_bookkeeping 2022-05-09 16:42:08 +02:00
Laurent Destailleur
720a09dacb Fix regression 2022-05-09 15:57:10 +02:00
Laurent Destailleur
86a8ae8c3d NEW Suggest a way to run upgrade per entities. 2022-05-09 15:24:46 +02:00
Florian HENRY
333b22b961 fix: limit filename lenght to show glasses 2022-05-09 14:32:47 +02:00
Laurent Destailleur
e9d7e216e2 Debug v16 2022-05-09 12:13:31 +02:00
Laurent Destailleur
c3c24fe342 NEW The 'reposition' class works on ajax constantonoff that redirects 2022-05-09 11:52:19 +02:00
Laurent Destailleur
9ae3f442e7 Fix css 2022-05-09 11:28:00 +02:00
Laurent Destailleur
7c32ac2f42 Debug v16 2022-05-09 11:16:58 +02:00
stickler-ci
017eb99e86 Fixing style errors. 2022-05-09 07:53:37 +00:00
Pierre Ardoin
ec00c6fef2
line deleted when updated after rapproched 
Fix an issue that deletes line when we update data after its rappro.
 2022-05-09 09:49:07 +02:00
Laurent Destailleur
104b4dcfe5 Trans 2022-05-09 09:31:43 +02:00
Laurent Destailleur
522c092aeb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-05-09 09:26:10 +02:00
melina
0ac89a5eae test reshook 2022-05-09 08:23:26 +02:00
Laurent Destailleur
b3b6337c4c
Merge branch 'develop' into NEW_deposit_payment_terms 2022-05-08 23:09:06 +02:00
stickler-ci
a12c0f6dbf Fixing style errors. 2022-05-08 18:33:23 +00:00
Laurent Destailleur
c718b86f9b
Update index.php 2022-05-08 20:28:37 +02:00
Laurent Destailleur
4779b8d3e1
Merge branch 'develop' into categorydescription 2022-05-08 20:26:48 +02:00
Laurent Destailleur
30597d7f89
Merge pull request #18163 from FHenry/dev_new_project_upgrade_external_user_perms_project 
NEW: Separate read-only and adding time on projects
 2022-05-08 19:50:46 +02:00
Laurent Destailleur
90c95bc638
Merge pull request #20610 from hregis/fix_missng_signature_library 
FIX missing signature library when ODT model is used
 2022-05-08 19:36:06 +02:00
Laurent Destailleur
c24c2015af
Merge pull request #20762 from fappels/develop_chkbxlst_entity_filter 
NEW: Can use current entity filter on 'chkbxlst'
 2022-05-08 19:16:20 +02:00
Laurent Destailleur
07e252e8e4
Merge pull request #20781 from hregis/fix_missing_country_filter 
FIX missing country filter in contract list
 2022-05-08 19:15:46 +02:00
Laurent Destailleur
f14e614430
Merge pull request #20779 from atm-GregM/develop_new_massaction_extrafield_product 
NEW : Add massaction "Edit Extrafield" for Product
 2022-05-08 19:15:25 +02:00
Laurent Destailleur
16fac44e9f
Update products.lang 2022-05-08 19:14:32 +02:00
Laurent Destailleur
b04ef20708
Merge pull request #20782 from atm-adrien/FIX_move_inventory_column-develop 
Fix move inventory column develop
 2022-05-08 19:13:26 +02:00
Laurent Destailleur
b4e1bac32d
Merge pull request #20783 from fappels/14_fix_error_handling 
Fix errors.lang merge conflict and fix reception error handling
 2022-05-08 19:12:11 +02:00
Laurent Destailleur
a65e9f33db
Merge pull request #20793 from atm-gauthier/fix_salaries_payments_and_stats 
FIX : in salary stats and payment list, we must check right perms as well as salary list
 2022-05-08 19:11:54 +02:00
Laurent Destailleur
649e6eb3ac
Merge pull request #20787 from dolibit-ut/patch-399 
Update index.php
 2022-05-08 19:10:09 +02:00
Laurent Destailleur
56c943d4a7
Merge pull request #20794 from altairis-melina/invoicehooks 
NEW: TakePos - add hooks for cart display
 2022-05-08 19:08:30 +02:00
Laurent Destailleur
b416c49348
Merge pull request #20796 from altairis-melina/transradio 
FIX: size and translations of radio buttons
 2022-05-08 19:07:11 +02:00
Laurent Destailleur
cfe347de17
Merge pull request #20799 from FHenry/15.0_fix_invoice_stat 
fix: invoice stat
 2022-05-08 19:03:55 +02:00
Laurent Destailleur
9f0ddd3712
Merge pull request #20800 from ATM-Consulting/FIX_pricejs 
FIX: make pricejs behave more like PHP's price() in Dolibarr
 2022-05-08 19:03:38 +02:00
Laurent Destailleur
000c6f69bd
Merge pull request #20801 from aspangaro/16a31 
Look & feel v16
 2022-05-08 18:56:23 +02:00
Laurent Destailleur
bbba8abebc
Merge pull request #20805 from aspangaro/16a32 
FIX Accountancy - Product Account - SQL Error with only_full_group_by option enabled
 2022-05-08 18:55:46 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
Laurent Destailleur
65eb11efdf Fix sql migration 2022-05-08 17:39:53 +02:00
Laurent Destailleur
f52a7a26f6 Debug v16 - Fix for postgresql - Fix for sql loading per module - php8 2022-05-08 15:18:34 +02:00
Alexandre SPANGARO
710f189b98 FIX SQL Error with full_group_by option enabled 2022-05-08 06:34:47 +02:00
Laurent Destailleur
3256ac2f2a css 2022-05-07 19:47:51 +02:00
Alexandre SPANGARO
6ee15794e6 Merge remote-tracking branch 'upstream/develop' into 16a29-Fixcustomerdeposit 2022-05-07 07:59:23 +02:00
Alexandre SPANGARO
39716dce28 Look & feel v16 2022-05-07 06:43:23 +02:00
Laurent Destailleur
6b9ed5aa32 Better message in installation process 2022-05-06 20:03:59 +02:00
atm-florian
60b7904340 typo in doc string 2022-05-06 18:50:02 +02:00