Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-29 12:13:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
145,227 Commits 38 Branches 191 Tags
0de4e225fb702681d7e9d19ecda1c1da170a357e
Commit Graph

9579 Commits

Author SHA1 Message Date
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