Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 19:41:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
96,016 Commits 36 Branches 190 Tags
0127a3bedb51f05f32f11c23fe9a2398ad1c7e21
Commit Graph

7184 Commits

Author SHA1 Message Date
Laurent Destailleur
c875ad9a1c FIX #16240 2021-02-10 02:17:01 +01:00
Laurent Destailleur
2c30680157 Merge pull request #16244 from AlexisLaurier/13.0 
fix regression of #16118 - entity not check on object in checkUserAccessToObject
 2021-02-10 01:25:19 +01:00
LAURIER Alexis
0ae0eb5758 fix regression of #16118 - entity not check 
Entity is not anymore check for user having permission $user->rights->societe->client->voir on the current entity. Then we can open object from any entity with current permissions and the entity field of objects are not anymore checked.
 2021-02-09 20:13:13 +01:00
Gauthier PC portable 024
d106fe7e90 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-09 09:50:46 +01:00
Frédéric FRANCE
898bf55202 Merge remote-tracking branch 'upstream/develop' into facturerec 2021-02-08 20:21:46 +01:00
Laurent Destailleur
af4d3767ea css 2021-02-08 19:56:38 +01:00
Frédéric FRANCE
815f3602e3 clean deprecated modelpdf to model_pdf 2021-02-08 18:30:09 +01:00
Laurent Destailleur
c0aa7e7db5 Merge pull request #16020 from atm-gauthier/NEW/add_real_payments_on_vat_objects 
NEW VAT payment request and VAT payment are 2 different steps in workflow on VAT payment recording
 2021-02-08 17:19:40 +01:00
Laurent Destailleur
fe9d23e90b Update functions.lib.php 2021-02-08 15:10:14 +01:00
Frédéric FRANCE
e15e8bcd05 Update functions.lib.php 2021-02-08 15:10:07 +01:00
Laurent Destailleur
d0bbf5bf35 Update functions.lib.php 2021-02-08 15:08:24 +01:00
Gauthier PC portable 024
41af1a59f4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-08 10:37:01 +01:00
Gauthier PC portable 024
e2a73e6c88 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects 2021-02-08 09:46:48 +01:00
Alexandre SPANGARO
b8ea96ba57 Fix module asset in development 2021-02-08 05:39:07 +01:00
Frédéric FRANCE
c83ccb1e0f Update functions.lib.php 2021-02-08 00:46:46 +01:00
Laurent Destailleur
1f32d4a815 Avoid warning 2021-02-07 21:21:21 +01:00
Laurent Destailleur
45789ec21c Fix TZ problems 
Conflicts:
	htdocs/core/lib/company.lib.php
 2021-02-07 19:47:33 +01:00
Laurent Destailleur
8c71c8335e Fix TZ problems 2021-02-07 19:44:22 +01:00
Laurent Destailleur
7b72ac5a7a Look and feel v14 2021-02-06 12:10:27 +01:00
Laurent Destailleur
3dedd81f37 Same width for all picto of menu 2021-02-06 11:56:27 +01:00
Laurent Destailleur
fd3354142b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
 2021-02-06 01:17:05 +01:00
Laurent Destailleur
ac83cea83a Fix avoid to run import twice by clicking on tab step6 
Fix timeout for real import step
 2021-02-05 14:34:04 +01:00
Laurent Destailleur
c441b54521 NEW If not logo defined, can use squarred logo on login page 2021-02-05 12:07:39 +01:00
Gauthier PC portable 024
df8ca1ef84 Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 09:29:20 +01:00
Laurent Destailleur
21a9a69ba1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	test/phpunit/SecurityTest.php
 2021-02-04 23:38:42 +01:00
Laurent Destailleur
4a2f26415e Fix GETPOST accept < if followed with a number 2021-02-04 23:36:41 +01:00
Laurent Destailleur
a4f6c2d0c6 More log 2021-02-04 22:03:58 +01:00
Laurent Destailleur
2a48529aea Look and feel v14 2021-02-04 20:44:38 +01:00
Laurent Destailleur
964fa7a72d Look and feel v14 2021-02-04 20:29:57 +01:00
Laurent Destailleur
1b7ee97082 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-04 19:49:32 +01:00
Laurent Destailleur
726ef265f2 Look and feel v14 2021-02-04 19:21:07 +01:00
Gauthier PC portable 024
e188ec6cd7 NEW : add real payments on salaries objects 2021-02-04 17:21:08 +01:00
Laurent Destailleur
a6b08b241f Doc 2021-02-04 17:13:00 +01:00
Laurent Destailleur
eee49b9132 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/delais.php
 2021-02-04 13:50:07 +01:00
Laurent Destailleur
524b28d8c3 Fix missing tab info on holiday 2021-02-04 12:15:31 +01:00
Laurent Destailleur
eca010937f FIX Trigger on expense report was not fired 
FIX Bad dates on info tabs
 2021-02-04 11:56:53 +01:00
Laurent Destailleur
4d029194d3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/ajax.lib.php
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
 2021-02-02 13:22:23 +01:00
Laurent Destailleur
b80de4aeaf FIX CSRF errors on margin forms 2021-02-02 13:04:41 +01:00
Laurent Destailleur
2e9656a5b2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formactions.class.php
	htdocs/filefunc.inc.php
 2021-02-02 03:26:20 +01:00
Laurent Destailleur
daf88944f8 FIX #16118 Timezone problem on some fields 2021-02-02 00:19:41 +01:00
Gauthier PC portable 024
1eb4968a29 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects 2021-02-01 12:00:04 +01:00
Laurent Destailleur
7887d4cc8e Fix price2num on all GETPOST('remise_percent') 2021-01-31 12:48:40 +01:00
Laurent Destailleur
b24aac1e6b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
 2021-01-31 12:03:39 +01:00
Laurent Destailleur
ca7738c9b3 FIX #16107 2021-01-30 13:57:42 +01:00
Laurent Destailleur
db9b6b53da NEW Can set a label as placeholder for combo lists. 2021-01-28 16:31:32 +01:00
Laurent Destailleur
9ec5ba46fb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2021-01-28 14:47:06 +01:00
Laurent Destailleur
3eebbc6426 NEW Add function showValueWithClipboardCPButton() to add a copy/paste 
button on a text.
 2021-01-28 12:44:45 +01:00
Laurent Destailleur
ce3279c462 NEW Add function showValueWithCopyAndPasteButton() to add a copy/paste 
button on a text.
 2021-01-28 12:34:54 +01:00
Laurent Destailleur
cf4a12d715 FIX Missing language ico 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2021-01-28 12:04:04 +01:00
Laurent Destailleur
1a7f3938f2 FIX Missing language ico 2021-01-28 12:02:16 +01:00