Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

244 Commits

Author SHA1 Message Date
Laurent Destailleur
c0ef3b46ad Work on MRP module 2019-12-20 15:31:05 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
5aeb667e94 Debug modulebuilder 2019-12-17 12:06:09 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Laurent Destailleur
1636d341c7 Debug module BOM 
Enhance demo data for TakePOS
 2019-11-28 15:18:14 +01:00
Laurent Destailleur
24bb345ee1 Fix bad name of function 2019-11-22 15:35:19 +01:00
Scrutinizer Auto-Fixer
1eab97080c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-22 14:13:30 +00:00
Laurent Destailleur
8c1bba5a60 Fix cancel link 2019-11-11 21:11:12 +01:00
Laurent Destailleur
19213b0d3d Fix modulebuilder 2019-11-11 21:02:32 +01:00
Laurent Destailleur
96314c9c26 Debug BOM 2019-11-09 20:12:27 +01:00
Laurent Destailleur
b1394463db Debug mrp 2019-11-09 20:02:46 +01:00
Laurent Destailleur
5b6ace387e Debug BOM and MO module 2019-11-09 19:47:49 +01:00
Scrutinizer Auto-Fixer
812d0af1d9 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-08 14:51:54 +00:00
Laurent Destailleur
7c4942b7be Fix debug BOM/MO 2019-11-05 20:14:33 +01:00
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Laurent Destailleur
e67a1a8118 Debug 2019-11-04 14:20:42 +01:00
Laurent Destailleur
b0ea276233 Debug MO module 2019-11-04 14:13:36 +01:00
Laurent Destailleur
f242cf4cc1 Debug modulebuilder 2019-11-03 19:15:32 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
645390c990 Work on BOM templates 2019-10-31 02:36:16 +01:00
Laurent Destailleur
7d6306dfa8 Look and feel v11 2019-10-24 13:09:50 +02:00
Laurent Destailleur
5ad7ca5620 Code more generic around setting projet on a card 2019-10-22 13:43:24 +02:00
Laurent Destailleur
e261d63295 NEW Can add a button "Create" after combo of object with modulebuilder. 2019-10-21 14:44:39 +02:00
Laurent Destailleur
205967976c Can set a BOM to draft 2019-10-16 18:35:15 +02:00
Laurent Destailleur
ffc4820970 Fix counter of BOM 2019-10-16 02:05:23 +02:00
Laurent Destailleur
fb3d20107c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/exports/export.php
	htdocs/filefunc.inc.php
 2019-10-15 03:51:57 +02:00
Laurent Destailleur
056f7f826b Clean code 2019-10-14 20:41:28 +02:00
Laurent Destailleur
dccfdad9dd Work on inventory feature 2019-10-12 11:32:47 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Laurent Destailleur
0f2b36bb82 Work on MRP module 2019-09-29 18:39:52 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
bc0b8dfad0 FIX Consistency in direct debit order lists. 
FIX Confirmation of deletion
 2019-09-06 14:24:33 +02:00
Laurent Destailleur
657a3ae4c5 FIX permission to delete a draft purchase order 2019-07-04 12:43:32 +02:00
Laurent Destailleur
08d5ca4ddb Debug page to export accounting documents 2019-06-17 17:53:43 +02:00
Laurent Destailleur
06e0ec5e0c Fix link 2019-06-05 08:26:08 +02:00
Laurent Destailleur
a143dba9f8 Work on incomplete code on BOM module 2019-06-03 20:46:11 +02:00
Laurent Destailleur
72f55e1d81 Debug modulebuilder 2019-06-03 18:11:53 +02:00
Laurent Destailleur
cafb3840b7 Fix look and feel v10 2019-05-29 12:56:11 +02:00
Laurent Destailleur
c131363dd1 Debug modulebuilder 2019-05-22 19:40:48 +02:00
Laurent Destailleur
983ac4e758
Merge pull request #11220 from frederic34/patch-5 
printObjectLines return void
 2019-05-21 22:39:58 +02:00
Laurent Destailleur
3c1b860da4 Fix css 2019-05-20 12:16:39 +02:00
Frédéric FRANCE
7b317c4cbf
printObjectLines return void 2019-05-19 09:28:34 +02:00
Laurent Destailleur
c6ccb92a51 Fix table shown when there is no perm 
Fix edit admin status of another admin
 2019-05-19 01:41:42 +02:00
Laurent Destailleur
8fc5fdd1c7
Update myobject_card.php 2019-05-18 00:54:41 +02:00
Nicolas ZABOURI
9ab718ec5e FIX #11045 2019-05-18 00:19:06 +02:00
Laurent Destailleur
bdb467b17a fix typo 2019-05-16 09:32:06 +02:00
Laurent Destailleur
cf058e7d3b NEW Ask date of invoice when using the Clone feature. 2019-04-12 12:12:08 +02:00
Laurent Destailleur
98ca9bf17a Reduce quantity of string to translates 2019-03-12 19:44:59 +01:00
Laurent Destailleur
6ae36ce6a7 Work on BOM 2019-03-12 19:20:01 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Laurent Destailleur
a72d92006b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-16 13:57:33 +01:00
Laurent Destailleur
f4dd8a4e50 Update myobject_card.php 2019-01-16 12:47:44 +01:00
Bahfir Abbes
66f17ac422 simplification 2019-01-16 12:47:36 +01:00
Abbes Bahfir
6b808acfbb linl back to list if cancelled on create 2019-01-16 12:47:31 +01:00
ldestailleur
451b3e30cc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/cashdesk.lang
 2019-01-04 19:36:20 +01:00
ldestailleur
1b19f5153b Fix cash fence feature 2019-01-03 14:18:02 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Laurent Destailleur
970f501147 Debug modulebuilder 2018-10-31 20:10:20 +01:00
Laurent Destailleur
68f6ebd0ff Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/security.lib.php
	htdocs/modulebuilder/template/myobject_card.php
 2018-10-30 14:47:39 +01:00
Laurent Destailleur
8fbf5b1f33 FIX deletion on draft is allowed if we are allwoed to create 2018-10-29 18:28:19 +01:00
Laurent Destailleur
873f43db94 Uniformize interface for tickets 2018-10-01 03:19:21 +02:00
Laurent Destailleur
c2548b8b39
Merge pull request #9298 from ksar-ksar/Upd_hook_formConfirm 
NEW hook formConfirm always called if hooked
 2018-09-01 14:50:08 +02:00
ksar-ksar
49d3bea192 Remove the test 
After discussion with Frederic, the best solution is to remove the test
 2018-08-30 11:27:48 +02:00
Laurent Destailleur
2db84a679e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/index.php
 2018-08-28 02:35:45 +02:00
ksar-ksar
a844855ade Update hook formConfirm 
The hook should be called when the $formconfirm is not empty
 2018-08-24 16:40:26 +02:00
Laurent Destailleur
79aa0bbd1c Fix duplicate load 2018-08-24 12:28:44 +02:00
Laurent Destailleur
89d55f3b46 Fix lib in modulebuilder 2018-08-24 11:45:22 +02:00
Laurent Destailleur
32594e8048 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-24 10:47:10 +02:00
Laurent Destailleur
64427dafb6 Fix back to page when canceling an edit in the module template 2018-08-23 20:21:27 +02:00
Philippe GRAND
e35da2f84d Standardize code 2018-08-14 09:55:58 +02:00
Frédéric FRANCE
fa2de55109
test include 2018-07-26 11:50:54 +02:00
Laurent Destailleur
7bf33b1bac Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/hrm/index.php
	htdocs/install/mysql/tables/llx_website_account.key.sql
	htdocs/modulebuilder/template/myobject_card.php
 2018-07-02 12:16:51 +02:00
Laurent Destailleur
da138db528 FIX combo into popup become crazy with IE10 
Conflicts:
	htdocs/asset/card.php
	htdocs/modulebuilder/template/myobject_card.php
 2018-06-28 12:16:12 +02:00
Laurent Destailleur
3ea2d81279 FIX combo into popup become crazy with IE10 2018-06-28 12:05:02 +02:00
Laurent Destailleur
edd7499375 Fix clone with new architecture 2018-06-19 09:21:23 +02:00
Laurent Destailleur
e402f68593 Clean code 2018-06-19 08:51:25 +02:00
Frédéric FRANCE
58e5715ac3
loadlangs 2018-05-26 17:57:30 +02:00
Frédéric FRANCE
1b69c2357f
typo 2018-05-23 17:16:58 +02:00
Laurent Destailleur
b84baece3c Code comment 2018-05-12 11:32:00 +02:00
Laurent Destailleur
32ace6a8cf NEW Add hook setContentSecurityPolicy 2018-04-30 15:17:38 +02:00
Laurent Destailleur
f1b9188e9b
Merge pull request #8563 from ATM-Marc/NEW_backurlforcard 
NEW: default add action: new param $backurlforcard to redirect to card
 2018-04-27 11:57:15 +02:00
Laurent Destailleur
fef5a24870
Update myobject_card.php 2018-04-27 11:52:40 +02:00
florian HENRY
70961bd075 fix perms 2018-04-24 12:46:16 +02:00
Laurent Destailleur
cef9782179 Clean defined constant at begin of pages 2018-04-21 12:00:55 +02:00
Marc de Lima Lucio
1a9675e410 FIX: user $backtopage insteead of $backurlforcard 2018-04-18 10:12:19 +02:00
Laurent Destailleur
3cecfd02c7 NEW Mutualize code for action="update_extras" 
NEW Can use setValueFrom without user modification field
FIX Exclude separators from mandatory extrafields test
More code to use the new framework array for extrafields
Can use text condition in extrafield visibility
 2018-04-12 23:16:23 +02:00
Marc de Lima Lucio
2a265e9de9 NEW: default add action: new param $backurlforcard to redict to card 2018-04-11 12:32:55 +02:00
Laurent Destailleur
4d94327ead Look and feel v8 2018-04-07 16:17:40 +02:00
Laurent Destailleur
b6e9e0e287 Fix missing hooks 2018-03-30 16:44:58 +02:00
Laurent Destailleur
3b55049895 Dolibarrize module ticket 2018-03-22 10:23:25 +01:00
Laurent Destailleur
e118daf4b1 More complete skeleton 2018-03-16 01:12:57 +01:00
Alexis Algoud
5d692482a3 fix good write to add 2018-03-10 11:18:05 +01:00
Laurent Destailleur
b4446764f8 Clean code of deprecated usage 2018-02-21 14:48:25 +01:00
Laurent Destailleur
362aec3e4b NEW Add param $dolibarr_main_restrict_ip in config file to limit ips 2018-02-15 19:49:50 +01:00
Laurent Destailleur
b515448bbd Fix delete when no extrafields used 2018-02-15 00:01:25 +01:00
Laurent Destailleur
e270295f5c Fix modulebuilder 2017-12-09 20:40:11 +01:00
Laurent Destailleur
9f235e1ff6 Standardize database: field ref of warehouse was renamed label -> ref 2017-11-24 15:27:00 +01:00
Laurent Destailleur
9bdd31e05a Module builder 2017-11-21 12:28:34 +01:00
Laurent Destailleur
e6d02cebe7 Complete templates 2017-11-16 12:09:17 +01:00
Laurent Destailleur
403067812d Modulebuilder 2017-11-04 16:42:32 +01:00
Laurent Destailleur
e865f41b86 NEW Extrafields "link to object" now use a combo selection and getNomUrl 2017-10-26 02:55:43 +02:00
Laurent Destailleur
66d2c29fe1 Work on modulebuilder and website module 2017-10-26 01:02:13 +02:00
Laurent Destailleur
bb996019c2 NEW Support visibility on extrafields 2017-10-25 11:42:14 +02:00
Laurent Destailleur
d2f723045c Work on website and modulebuilder 2017-10-24 17:30:05 +02:00
Laurent Destailleur
285203ed0e Reduce diplicate code 2017-10-22 17:00:35 +02:00
Laurent Destailleur
7f85d73001 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contrat/card.php
	htdocs/expensereport/card.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/paiement/card.php
	htdocs/livraison/card.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/societe/rib.php
	htdocs/supplier_proposal/list.php
	htdocs/user/card.php
 2017-10-18 19:51:29 +02:00
Laurent Destailleur
8626d6279a Fix perm to delete files 2017-10-18 17:21:30 +02:00
Laurent Destailleur
99acd1b974 Fix cancel button on create 2017-10-03 14:58:53 +02:00
Laurent Destailleur
b50a0df6fb Tab notes and linked files supported by module builder 2017-09-29 15:44:43 +02:00
Laurent Destailleur
d2d77d4625 Module builder 2017-09-29 15:19:49 +02:00
Laurent Destailleur
abc86d72f6 Module builder 2017-09-29 13:41:59 +02:00
Laurent Destailleur
f007f9e7e5 NEW Add new property visible dy default on lists on extrafields 2017-09-29 13:26:44 +02:00
Laurent Destailleur
fac4ebec22 Code comment 2017-09-24 10:26:43 +02:00
Laurent Destailleur
b4e461e7ea Debug modulebuilder 2017-09-23 18:17:34 +02:00
Laurent Destailleur
414f633e75 Fix css 2017-09-23 12:59:49 +02:00
Laurent Destailleur
57adc28256 Work on modulebuilder 2017-09-23 01:45:03 +02:00
Laurent Destailleur
ab5724e7ff Mutualize code for forms to send emails. Remove thousand line of code. 2017-09-17 17:12:14 +02:00
Laurent Destailleur
149ab80b3a The event array of an object is visible even if no event yet recorded. 2017-09-13 14:18:36 +02:00
Laurent Destailleur
0c066b471d Debug modulebuilder 2017-09-05 22:33:55 +02:00
Laurent Destailleur
d511fed504 Enhance modulebuilder 2017-07-25 12:44:55 +02:00
Laurent Destailleur
dcf5fd20bb Fix navigation on card generated by modulebuilder 2017-07-25 10:38:39 +02:00
Laurent Destailleur
bfd1fa3984 Enhance modulebuilder 2017-07-25 02:56:19 +02:00
Laurent Destailleur
aff61fad7d Fix new generic classes system 2017-07-25 01:21:20 +02:00
Laurent Destailleur
e571616d52 Debug modulebuilder 2017-07-25 00:21:01 +02:00
Laurent Destailleur
8303cee676 Debug modulebuilder 2017-07-24 21:03:35 +02:00
Laurent Destailleur
dcb79e66cc Debug modulebuilder 2017-07-24 13:55:12 +02:00
Laurent Destailleur
cb87b314be FIX Maxi debug of journalization of bank journal. 2017-07-15 03:41:07 +02:00
Laurent Destailleur
fb0298ff1c Fix template should work if module in root dir 2017-07-13 09:15:37 +02:00
Laurent Destailleur
33ceb22b8b Fix error management into modulebuilder 2017-07-12 13:25:18 +02:00
Laurent Destailleur
cf6745b1ae Debug module builder 2017-07-08 17:08:07 +02:00
Laurent Destailleur
8db4e91888 Debug modulebuilder 2017-07-08 15:43:36 +02:00
Laurent Destailleur
d2fd4d6978 Better path to laod main.inc.php 2017-06-23 23:36:25 +02:00
Laurent Destailleur
247803f894 Better templates 2017-06-23 20:03:15 +02:00
Laurent Destailleur
a96362e2f9 Fix #formmailbeforetitle not supported everywhere 2017-06-11 11:40:01 +02:00
Laurent Destailleur
1820649175 Maxi debug of v6 2017-06-07 19:28:31 +02:00
Laurent Destailleur
c4f09b8894 Work on modulebuilder 2017-05-28 14:43:17 +02:00
Laurent Destailleur
c651f1da45 Work on modulebuilder tool 2017-05-27 19:05:36 +02:00
Laurent Destailleur
5a31d2c95a Fix css 2017-05-10 13:39:00 +02:00