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

7588 Commits

Author SHA1 Message Date
lvessiller
241a65e2ae NEW add margin info in proposal and order list 2022-02-03 10:39:03 +01:00
Laurent Destailleur
44bc197d03 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-01 13:25:45 +01:00
Laurent Destailleur
d167e022eb Debug v15 2022-01-31 12:08:51 +01:00
Laurent Destailleur
2fea78c90a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/data/llx_c_action_trigger.sql
 2022-01-29 16:48:40 +01:00
Laurent Destailleur
d75dd51bb7 Clean code to debug fulldayevent 2022-01-29 00:39:20 +01:00
Gauthier PC portable 024
3abe391f65 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-28 15:08:02 +01:00
Laurent Destailleur
eb336c81a1
Merge pull request #19926 from aspangaro/16a9 
NEW API Proposals - Add POST lines
 2022-01-26 12:06:33 +01:00
Alexandre SPANGARO
31787a99f0 NEW Proposal - Add filter on proposal get lines 2022-01-26 08:50:57 +01:00
stickler-ci
71876755d2 Fixing style errors. 2022-01-26 06:35:26 +00:00
Alexandre SPANGARO
68ba60896f Copyright 2022-01-26 07:31:17 +01:00
Alexandre SPANGARO
30fd55addc NEW API Proposals - Add POST lines 2022-01-26 07:29:37 +01:00
Laurent Destailleur
d06f570c23 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-19 16:50:11 +01:00
Laurent Destailleur
60b90056c4 Fix #yogosha8450 2022-01-19 15:20:10 +01:00
Laurent Destailleur
1087ddb22f Clean code 2022-01-18 14:00:38 +01:00
Laurent Destailleur
ebc3ef2f37 Removed no more used property 2022-01-18 13:52:09 +01:00
Laurent Destailleur
fb6e5f03f9 Clean code and translation 2022-01-18 13:44:52 +01:00
Laurent Destailleur
e19994c756 Fix drag event on week view 2022-01-18 00:07:45 +01:00
Laurent Destailleur
254ed31fb1 Fix combo 2022-01-17 23:47:23 +01:00
Laurent Destailleur
70e4705149 Clean code 2022-01-17 22:52:56 +01:00
Laurent Destailleur
0e44bfd4e4 Fix remove $_GET 2022-01-17 18:53:57 +01:00
Laurent Destailleur
9d067d74ab Fix responsive 2022-01-17 17:51:03 +01:00
Laurent Destailleur
6826b373fd css 2022-01-16 13:22:21 +01:00
Laurent Destailleur
f51554fd4d Fix missing token 2022-01-13 20:40:42 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
8e2f76ca66
Merge pull request #17577 from OGPayet/feature/addThirdpartyCustomerCodeToEmailingSubstitutionArray 
add thirdparty customer code to substitutionarray
 2022-01-11 13:31:32 +01:00
Laurent Destailleur
54cf91eda4
Update card.php 2022-01-11 13:31:16 +01:00
Gauthier PC portable 024
6799d48944 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-11 09:59:25 +01:00
Laurent Destailleur
60b2479389 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/list.php
 2022-01-07 16:00:19 +01:00
Laurent Destailleur
7618966f81 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/core/class/utils.class.php
	htdocs/install/mysql/data/llx_20_c_departements.sql
 2022-01-07 15:56:21 +01:00
Laurent Destailleur
37daf7764d
Merge pull request #19753 from atm-lena/13.0_FIX_ActionCommList_LateWarning 
FIX : late warning calculation on action comm list
 2022-01-06 12:55:37 +01:00
stickler-ci
ec11be2480 Fixing style errors. 2022-01-06 10:31:50 +00:00
atm-lena
97d9b4571a FIX : late warning calculation on action comm list 2022-01-06 11:21:46 +01:00
Laurent Destailleur
ef56631c80 FIX #yogosha8186 2022-01-03 18:15:19 +01:00
Laurent Destailleur
a49af456ce Debug page customreports.php 2022-01-03 04:47:17 +01:00
Laurent Destailleur
3774eae510 Responsive 2022-01-02 15:08:46 +01:00
Laurent Destailleur
bdb03c8bd0 Fix responsive 2022-01-02 13:51:30 +01:00
Laurent Destailleur
a7d4aa9fb3 Responsive 2022-01-02 12:49:15 +01:00
Laurent Destailleur
7edba34107 Debug and secure the signature feature 2021-12-25 17:08:40 +01:00
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Laurent Destailleur
19efa37e4b Fix default value #19562 2021-12-19 20:55:24 +01:00
Laurent Destailleur
e2e2e69379 Fix bad link 2021-12-19 03:54:04 +01:00
Laurent Destailleur
4cd512738f
Merge pull request #19543 from mbinformatique68/develop 
FIX Get societe terms of payment if getpost terms of payment is 0 on creating propal
 2021-12-16 18:19:29 +01:00
Laurent Destailleur
84400cf1d3 Fix backto page 2021-12-16 13:35:17 +01:00
Laurent Destailleur
bb1d5daa82 css 2021-12-12 23:47:40 +01:00
Laurent Destailleur
2bc417fcf7 FIX parameter $action replaced with $mode. $action reserved for action 2021-12-11 13:22:43 +01:00
Laurent Destailleur
b2611e4cdb CSS 2021-12-10 13:56:51 +01:00
Laurent Destailleur
d80f83caf4 Clean code 2021-12-09 17:19:31 +01:00
Laurent Destailleur
69cd7ae2ab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/don/card.php
	htdocs/public/test/badges.php
	htdocs/public/test/test_exec.php
 2021-12-08 18:27:03 +01:00
Laurent Destailleur
d4501a6f67 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-12-08 18:21:56 +01:00
Laurent Destailleur
c3bfd5caa4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/adherents/type.php
	htdocs/asset/type.php
	htdocs/categories/edit.php
	htdocs/comm/action/card.php
	htdocs/compta/bank/card.php
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/class/extrafields.class.php
	htdocs/don/card.php
	htdocs/product/stock/card.php
	htdocs/projet/card.php
	htdocs/projet/tasks/task.php
	htdocs/user/group/card.php
 2021-12-08 18:21:20 +01:00
Laurent Destailleur
f1dac82a53 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/adherents/card.php
	htdocs/categories/edit.php
	htdocs/contact/card.php
	htdocs/core/class/extrafields.class.php
	htdocs/product/stock/card.php
 2021-12-08 17:56:05 +01:00
Laurent Destailleur
6886cca1fa CSS 2021-12-07 02:35:46 +01:00
Quentin VIAL-GOUTEYRON
826bde0656 FIX set optional from post 2021-12-06 11:19:12 +01:00
mbinformatique68
1e845434e0 Get societe terms of payment if getpost terms of payment is 0 2021-12-03 09:42:50 +01:00
atm-greg
db06de0ac2 add printFieldListHaving hook 2021-11-30 16:28:21 +01:00
Laurent Destailleur
8bace4c64e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-30 16:24:42 +01:00
Laurent Destailleur
a298a845f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/memory.lib.php
	htdocs/langs/en_US/holiday.lang
	htdocs/ticket/card.php
 2021-11-30 16:24:18 +01:00
Laurent Destailleur
4189229b84
Merge pull request #19165 from Hystepik/develop#5 
Fix: php 8.0 warning commercial part
 2021-11-30 15:31:51 +01:00
Laurent Destailleur
31393802ff
Update card.php 2021-11-30 15:29:19 +01:00
Laurent Destailleur
efe4b2363a
Merge pull request #19514 from atm-greg/FIX_Uniformize_printFieldListFrom_hook 
uniformize hooks behaviour
 2021-11-30 11:20:22 +01:00
atm-greg
71d4b3f082 add hook // Add from hooks 2021-11-29 17:02:57 +01:00
atm-greg
1dffc1c0fa add hook to uniformize printFieldListFrom hook 2021-11-29 16:54:26 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed 
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
 2021-11-29 15:09:18 +01:00
Frédéric FRANCE
661e404a14
fix tests 2021-11-24 22:56:32 +01:00
Frédéric FRANCE
ebc54f82e6
move actioncomm 2021-11-24 18:16:48 +01:00
Frédéric FRANCE
d601f62194
can merge products but experimental 2021-11-23 21:38:29 +01:00
Gauthier PC portable 024
2c2f456827 Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-23 11:10:01 +01:00
Gauthier PC portable 024
74f5c092dc FIX : use $linecount = count($this->lines); 2021-11-23 10:44:43 +01:00
Gauthier PC portable 024
e02405edc9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2021-11-22 16:23:26 +01:00
Gauthier PC portable 024
9840c1e0fa Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-22 16:17:55 +01:00
Gauthier PC portable 024
e75b6ae0b4 FIX : it's better with an input number 2021-11-22 16:13:46 +01:00
Laurent Destailleur
441af6b6fb Fix add rel="noopener noreferrer" 2021-11-22 02:35:55 +01:00
Laurent Destailleur
48d7378282 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/comm/action/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/ar_IQ/bills.lang
	htdocs/langs/ar_IQ/cashdesk.lang
	htdocs/langs/ar_IQ/modulebuilder.lang
	htdocs/langs/ar_IQ/partnership.lang
	htdocs/langs/ar_IQ/propal.lang
	htdocs/langs/ar_IQ/stocks.lang
	htdocs/langs/ar_IQ/ticket.lang
	htdocs/langs/en_AE/admin.lang
	htdocs/langs/en_US/receptions.lang
	htdocs/langs/en_ZA/admin.lang
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/reception/class/reception.class.php
 2021-11-19 23:14:39 +01:00
lmarcouiller
d1f5cb9184 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#5 2021-11-19 14:01:52 +01:00
lmarcouiller
3bcafb548a fix errors 2021-11-19 14:01:37 +01:00
Gauthier PC portable 024
72614ecc0d Merge branch 'NEW/addline_with_position_choice_develop' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-16 16:43:01 +01:00
Gauthier PC portable 024
375dcf7028 FIX : dev name 2021-11-16 16:42:48 +01:00
stickler-ci
19171d4f8e Fixing style errors. 2021-11-16 15:15:55 +00:00
Gauthier PC portable 024
9d41c1390d Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-16 14:20:24 +01:00
Gauthier PC portable 024
1e0d7d92a9 NEW : addline with position choice when MAIN_VIEW_LINE_NUMBER is enabled 2021-11-16 14:09:18 +01:00
Florian HENRY
bc64aba3a6 FIX: preselect task on create event from task 2021-11-16 13:43:08 +01:00
Laurent Destailleur
897b00faf0 Clean code 2021-11-05 14:23:19 +01:00
Laurent Destailleur
960319fd8a dol_htmlentities is better for future than htmlentities 2021-11-01 10:33:54 +01:00
Laurent Destailleur
d21278b0ef
Merge branch 'develop' into fix_php8 2021-10-31 17:54:32 +01:00
Laurent Destailleur
40683720a3
Merge pull request #19182 from frederic34/propallist 
fix warnings in propal list
 2021-10-31 17:51:52 +01:00
Laurent Destailleur
e1047afb05
Merge pull request #19194 from atm-florianm/FIX_minor_remove_two_unused_js_lines 
[minor] remove two unused js lines
 2021-10-31 17:46:00 +01:00
Laurent Destailleur
8ebbe32781
Merge pull request #19205 from frederic34/patch-13 
fix warnings
 2021-10-31 17:34:46 +01:00
Laurent Destailleur
ef21b5ca78
Merge pull request #19206 from frederic34/patch-14 
fix warning
 2021-10-31 17:34:18 +01:00
Laurent Destailleur
0017c15974 Debug v15 2021-10-30 17:19:46 +02:00
Laurent Destailleur
fe7e1d4118 Look and feel v15 2021-10-29 09:40:38 +02:00
Laurent Destailleur
97d97af932 Clean: Remove fields for social networks (merged into "socialnetworks") 2021-10-27 16:39:34 +02:00
Laurent Destailleur
299376f221 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-26 01:32:37 +02:00
Laurent Destailleur
c376d40346 css 2021-10-26 01:30:00 +02:00
Scrutinizer Auto-Fixer
5567310e44 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-25 20:07:31 +00:00
Frédéric FRANCE
5469d49102
fix warning 2021-10-25 22:04:19 +02:00
Frédéric FRANCE
e3f4c70aea
Update list.php 2021-10-25 22:01:36 +02:00
Frédéric FRANCE
7638a2a8a0
fix warnings 2021-10-25 22:00:45 +02:00
Florian HENRY
52a4f4869d Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_php8 2021-10-25 16:54:30 +02:00
Laurent Destailleur
28926ab174 Fix permission on page to set resource of an object 2021-10-25 16:25:32 +02:00
atm-florian
28c5b105ba FIX: remove two lines of javascript referring to DOM elements that no longer exist in Dolibarr (form#move_event) 2021-10-25 11:20:28 +02:00
Florian HENRY
b282673f61 fix php8 warning 2021-10-25 09:01:05 +02:00
Frédéric FRANCE
677ac4635d
fix warnings in propal list 2021-10-24 14:34:47 +02:00
Lucas Marcouiller
051f6ca717 Fix: php 8.0 warning commercial part 2021-10-23 23:12:42 +02:00
Laurent Destailleur
ce4fe3f400 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-23 18:33:47 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Norbert Penel
64e58e305f
FIX #18893 : source was overwrited by mistake 2021-10-23 16:32:16 +02:00
Laurent Destailleur
06bc357409 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-23 14:49:50 +02:00
Laurent Destailleur
3f60cbbedc Remove the div class="ficheaddleft" 2021-10-23 14:49:35 +02:00
Frédéric FRANCE
2d92e6006c
fix warnings 2021-10-23 07:04:13 +02:00
Florian HENRY
bb4eb2feea Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_php8 2021-10-22 23:38:44 +02:00
Florian HENRY
1f1e01aa88 fix php 8 warning 2021-10-22 23:38:35 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings 2021-10-22 22:15:59 +02:00
Laurent Destailleur
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
 2021-10-20 15:06:10 +02:00
Laurent Destailleur
c6ef6a162b NEW Can edit fields of proposal when proposal is not yet signed 2021-10-19 22:20:23 +02:00
Laurent Destailleur
f4b5d14a34
Merge pull request #17536 from bb2a/Edit_in_propal 
[NEW] Add edit option in propal
 2021-10-19 22:10:12 +02:00
Laurent Destailleur
12d211815b Debug v15 2021-10-19 21:38:36 +02:00
Laurent Destailleur
c40a73162e Look and feel v15 2021-10-18 21:20:58 +02:00
lvessiller
a52ceaf1d2 FIX generate documents with PDF options 2021-10-18 12:12:00 +02:00
Laurent Destailleur
b66155de4b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/filefunc.inc.php
 2021-10-17 13:30:13 +02:00
Laurent Destailleur
8bdece7101 CSS 2021-10-16 21:43:48 +02:00
Laurent Destailleur
f2757a63a1 Clean code 2021-10-16 20:06:58 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
 2021-10-16 13:01:03 +02:00
Anthony Berton
8bbbe7b8bb Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Edit_in_propal 2021-10-11 12:11:08 +02:00
Laurent Destailleur
33761f9de3
Merge pull request #18917 from FHenry/NEW_dev_filter_from_dt_to_dt_actionlist 
NEW:Add filter from date to date into action/evt list
 2021-10-11 11:51:48 +02:00
Laurent Destailleur
874731af84 The 'action=delete&file=...' has been replaced with 
'action=deletefile&file=...' to avoid confusion with deletion of object
lines.
 2021-10-10 21:11:48 +02:00
lvessiller
be4a00213c FIX optional visibility on create card 2021-10-08 15:58:08 +02:00
Florian HENRY
f52e2be10e NEW:Add filter from date to date into action/evt list 2021-10-06 16:23:11 +02:00
Laurent Destailleur
ff56415c00
Merge pull request #18903 from aspangaro/15a21 
HTML5 - <font> tag is deprecated, replace by <span>
 2021-10-05 16:51:41 +02:00
Alexandre SPANGARO
c57aea1ead HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:10:37 +02:00
Laurent Destailleur
b3cb56f2ef Clean css 2021-10-04 04:14:31 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
157112758b Fix phpcs 2021-09-30 20:14:59 +02:00
Laurent Destailleur
673a2982a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/card.php
 2021-09-30 16:32:40 +02:00
Laurent Destailleur
ed264182c6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
	htdocs/takepos/receipt.php
 2021-09-30 16:28:42 +02:00
Laurent Destailleur
bb6399e12a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
 2021-09-30 16:21:36 +02:00
Laurent Destailleur
e15277bb6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-28 17:23:07 +02:00
Alexandre SPANGARO
43ed88f056 FIX Propal list - Problem of pagination on date 2021-09-27 23:02:19 +02:00
Laurent Destailleur
d4cc60640b Clean code 2021-09-27 15:41:58 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
0176ab6057 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
 2021-09-27 11:40:47 +02:00
Laurent Destailleur
c9ae46db50 FIX Filter on categories 2021-09-27 11:34:26 +02:00
Laurent Destailleur
bb5eb9e292 FIX Filter on categories 2021-09-26 20:56:17 +02:00
lmarcouiller
f88d12f55d Fix #18809 : error on client tooltip 2021-09-24 11:16:34 +02:00
Laurent Destailleur
38b8ed9092
Merge pull request #18792 from cfoellmann/PR/minor-button-fixes 
another set of cleanup for action buttons
 2021-09-24 01:55:25 +02:00
Laurent Destailleur
27c41946b7
Merge pull request #18182 from atm-jpb/NEW_field_in_service_object 
NEW : field and behavior in product object
 2021-09-23 12:14:09 +02:00
Christian Foellmann
08b395e127 another set of cleanup for action buttons 2021-09-22 08:43:30 +02:00
kamel
9266b4e8fd FIX Button text on proposal card for create a invoice 2021-09-21 19:44:49 +02:00
Laurent Destailleur
8cfccdcc5f
Merge pull request #18782 from OPEN-DSI/fix_00017 
FIX Button text on proposal card for create a invoice
 2021-09-21 19:44:05 +02:00
kamel
86a6e8af1f FIX Button text on proposal card for create a invoice 2021-09-21 14:15:17 +02:00