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

307 Commits

Author SHA1 Message Date
Laurent Destailleur
3a9e238dc6 FIX Missing value of $formconfirm as parameters of hook 2020-01-28 12:00:27 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Laurent Destailleur
2689f7515c Fix pb with colspan and extrafields. 
Fix remove empty id
 2019-11-16 14:38:05 +01:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:02 +00:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
8f6d38ee82
clean indent 2019-10-27 17:01:23 +01:00
Laurent Destailleur
f438325980 Look and feelv 2019-10-24 15:57:48 +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
Frédéric FRANCE
723b88f618
retrieve duration of lines 2019-10-02 22:41:14 +02:00
Frédéric FRANCE
edf559697a
restore unfinished old commit 2019-10-01 23:47:45 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
Laurent Destailleur
d8259d9db1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fichinter/card.php
 2019-06-07 22:59:59 +02:00
Laurent Destailleur
f6d8b46b40 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fichinter/card.php
 2019-06-07 22:58:58 +02:00
Laurent Destailleur
0a903da5dc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fichinter/card.php
 2019-06-07 22:53:30 +02:00
atm-josselin
c8ab7dee45 Display the intervention button only in develop mode 2019-06-06 16:34:44 +02:00
Laurent Destailleur
7d2cedfdcf Debug bom module 2019-06-03 19:29:49 +02:00
Laurent Destailleur
2218994958 FIX Duplicate encoding on error message 2019-05-29 09:51:45 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All 
methods requires the object User as first parameter.
 2019-04-25 12:11:32 +02:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Laurent Destailleur
eeafc3c630 Standardize translation of amount 2019-03-13 14:10:36 +01:00
Laurent Destailleur
98ca9bf17a Reduce quantity of string to translates 2019-03-12 19:44:59 +01:00
Joan Louis
f326c75be7 Update call to extrafields from cards 2019-03-11 21:34:16 +01:00
Joan Louis
ee5753819e Update call to extrafields from cards 2019-03-11 14:22:04 +01:00
Frédéric FRANCE
f9e671d8a9
replace html by html5 in fichinter 2019-03-07 21:29:15 +01:00
Laurent Destailleur
3ec2338c2d Look and feel v10 2019-02-26 19:37:32 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
5130019003 css 2019-01-17 19:27:26 +01:00
Philippe GRAND
31a83701ba Fix translation 2019-01-16 13:44:49 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Philippe GRAND
f6394e4210 fix : error 500 2018-11-07 15:07:57 +01:00
Philippe GRAND
671b4dc227 fix : missing translation 2018-11-07 14:01:49 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Frédéric FRANCE
80880d8fb9
replace select_date by selectDate 2018-09-08 13:00:39 +02:00
Regis Houssin
598f90486f Fix: syntax error (Travis) 2018-06-30 17:05:34 +02:00
Laurent Destailleur
3112244529
Merge pull request #8884 from defrance/patch-117 
New : fichinter models (like factureRec)
 2018-06-30 01:19:03 +02:00
Philippe GRAND
1bb91c7860 update and clean code 2018-06-24 16:20:27 +02:00
BENKE Charlene
991c6d97c0
Update card.php 2018-05-28 16:44:49 +02:00
Frédéric FRANCE
58e5715ac3
loadlangs 2018-05-26 17:57:30 +02:00
Laurent Destailleur
d4cd5a0d95 Fix syntax error 2018-04-13 13:37:43 +02:00
Laurent Destailleur
1521b0595b Clean code 2018-04-13 11:03:03 +02:00
Laurent Destailleur
7108f68db9 Remove old deprecated hook insertExtraFields. Triggers must be used for 
action on CRUD events.
 2018-04-10 12:03:01 +02:00
Laurent Destailleur
93f4d6fdcd Translation 2018-03-11 21:34:38 +01:00
Laurent Destailleur
3c552cec15 FIX Missing restore_lastsearch_values 2018-02-26 21:16:40 +01:00
Laurent Destailleur
0a79550f43 Fix oldcopy must be saved before update_extras 2018-02-23 16:11:00 +01:00
Laurent Destailleur
b4446764f8 Clean code of deprecated usage 2018-02-21 14:48:25 +01:00
Laurent Destailleur
809ef1bd00 FIX Trigger *_MODIFY must be called when editing a property event extra. 
Clean duplicate trigggers "*_CLONE"
 2018-02-20 18:09:38 +01:00
Jan Giebels
9642206bd1 Fix label generation for fichinter card generation from order. Labels get concatenated. 2018-01-19 12:21:42 +01:00
Laurent Destailleur
90ddfc3f7f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/translation.php
 2018-01-11 01:14:20 +01:00
Ferran Marcet
d99535d9da Fix: Still using property ->client instead of ->thirdparty. 2018-01-10 16:40:43 +01:00
Laurent Destailleur
9ed679d19a FIX #7882 2017-12-01 17:22:32 +01: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
eb1fdca157 NEW Can create intervention from a proposal 2017-10-17 10:44:18 +02:00
Laurent Destailleur
8e0da9bfeb Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/document.php
 2017-10-04 13:32:53 +02:00
Laurent Destailleur
9d6498f2a4 NEW Search filters in lists are restored when using "back to list" 2017-10-03 14:50:52 +02:00
Laurent Destailleur
7c30b3ca5d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-10-02 01:28:20 +02:00
Juanjo Menent
93cf135d5e FIX: #7510 Bug: extrafield content disappear when generate pdf within intervention 2017-09-28 12:05:41 +02:00
Laurent Destailleur
f1a563625b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
 2017-09-26 22:11:00 +02:00
Laurent Destailleur
04f4a81736 FIX #7505 2017-09-26 22:06:59 +02:00
Laurent Destailleur
e3da4188e2 GETPOST must not clean data for text input. 2017-09-25 00:16:52 +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
259cca0230 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/admin/mails_templates.php
 2017-09-08 13:30:54 +02:00
Neil Orley
e43b13968e New: Adds an hide hour button in the "intervention" module 
Adds a way to set the visibility of hours/mins of the intervention date field from the administration interface of the "intervention" module
 2017-09-07 15:31:19 +02:00
Laurent Destailleur
521d61c5ef Close #4512 2017-07-25 21:22:22 +02:00
Laurent Destailleur
6f82837b0f Fix GETPOST of lang_id 2017-06-27 17:27:01 +02:00
Laurent Destailleur
4102403482 Look and feel v6 2017-06-21 11:37:34 +02:00
Laurent Destailleur
a96362e2f9 Fix #formmailbeforetitle not supported everywhere 2017-06-11 11:40:01 +02:00
Laurent Destailleur
e93cefbbf0 FIX #6985 2017-06-11 10:37:58 +02:00
Laurent Destailleur
7c0de18ac1 Fix code comment 2017-06-10 12:56:28 +02:00
Laurent Destailleur
aec4cef5de Clean some code for type of event deprecated since 3.3 2017-05-19 12:58:38 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
3e9ccc186a NEW Small PDF template for products 2017-04-13 10:26:12 +02:00
Laurent Destailleur
b5b0eba470 Several enhancement for 6.0 2017-03-28 12:47:48 +02:00
Laurent Destailleur
b9a9997688 Page societe/soc.php and compta/facture.php was renamed into card.php 
to match page naming conventions.
 2017-03-20 21:29:22 +01:00
Marcos García de La Fuente
62a0c5be73 Little correction 2017-02-03 20:12:26 +01:00
Marcos García de La Fuente
2dfced366e NEW #2763 Go to document block after clicking in Generate document button 
Close #2763
 2017-02-03 20:11:06 +01:00
Laurent Destailleur
66819a34fa Fix several bugs 2017-01-22 13:19:07 +01:00
Laurent Destailleur
fc4aa96cd7 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/dispatch.php
 2017-01-20 21:02:05 +01:00
Laurent Destailleur
d21bb1e6b1 FIX #6237 2017-01-16 13:10:54 +01:00
Laurent Destailleur
43942e6ea2 Fix css and fix navigation on resource tab. 2016-12-23 13:04:46 +01:00
Laurent Destailleur
653eb4d907 Fix project into dol_banner 2016-12-10 20:00:07 +01:00
Laurent Destailleur
10c00d37b5 Complete use of dol_banner 2016-12-09 15:59:31 +01:00
Laurent Destailleur
e4a8342aef Fix div-table-form balance on all lists (solve responsive design) 2016-11-27 11:41:10 +01:00
Laurent Destailleur
16ce156631 Fix responsive design 2016-11-25 18:32:52 +01:00
Laurent Destailleur
15468d88a0 FIX #6007 2016-11-22 20:36:01 +01:00
Laurent Destailleur
7d182c286c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step1.php
	htdocs/projet/tasks/time.php
 2016-10-26 10:40:03 +02:00
Laurent Destailleur
6338b04ac0 Remove call of a deprecated function 2016-10-24 11:27:39 +02:00
philippe grand
14227549a8 Fix : Fatal error: Call to a member function fetch() on null 2016-10-21 16:03:56 +02:00
Sergio Sanchis Climent
8556dab68e NEW: #5830 2016-10-13 16:44:17 +02:00
Laurent Destailleur
6ac39b97e4 Fix restore list of attached files into action report 2016-10-03 00:38:28 +02:00
Laurent Destailleur
ea09eb13da Uniformize code 2016-09-26 00:10:29 +02:00
Laurent Destailleur
5602bcd440 NEW Add status Done on interventions 2016-09-19 13:09:50 +02:00
Laurent Destailleur
fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/sociales/charges.php
	htdocs/core/boxes/modules_boxes.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
 2016-08-28 02:40:20 +02:00
florian HENRY
cd8585da63 fix for finche inter same problem 2016-08-10 11:54:49 +02:00
Laurent Destailleur
4d4fc87e2b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/product/stock/productlot_list.php
	htdocs/websites/index.php
 2016-08-09 13:26:08 +02:00
Laurent Destailleur
bcd055b378 Move button to link to, in same part of code than code to output links. 2016-08-05 15:30:28 +02:00
Laurent Destailleur
7a7e7b330f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-04 11:58:11 +02:00
Laurent Destailleur
7f6e2a277a NEW Link between objects can be done on both side and on all objects 2016-08-04 11:57:37 +02:00
aspangaro
21e753d510 Uniformize presentation on intervention 2016-08-03 08:00:30 +02:00
Laurent Destailleur
e4f51b7f32 FIX Select new thirdparty 2016-07-27 14:15:58 +02:00
Laurent Destailleur
a147798f18 FIX Select new thirdparty 2016-07-27 14:15:14 +02:00
Raphaël Doursenaud
052a11a5c0
Fixed interventions from order. 
Handling of predefined services was buggy and resulted in an SQL error
because of uninitialized duration.

Generalized services duration handling and exposed it in the module's
admin page.
 2016-07-25 17:24:57 +02:00
Laurent Destailleur
525b2cf297 Fix: Edition of contract on intervention failed 2016-07-02 12:02:51 +02:00
Laurent Destailleur
02e35f8c76 Fix where is the clone of intervention ? 2016-07-01 18:16:26 +02:00
Laurent Destailleur
2767df2e01 FIX Solve problem of sending joinded files of another email when several 
tabs are opened on form to send emails.
 2016-06-24 16:10:52 +02:00
Laurent Destailleur
1748da6c56 Merge 2016-06-04 14:51:56 +02:00
Laurent Destailleur
b639849a47 Page for proposals must be called card.php (one of last architecture 
change before the freeze)
 2016-04-23 15:37:22 +02:00
Laurent Destailleur
467662143f Merge pull request #5046 from bafbes/abb-17 
fix:use of function updateExtrafield instead of insertExtrafields in interventions
 2016-04-22 18:31:14 +02:00
Laurent Destailleur
1e5ff7388c Merge pull request #5031 from marcosgdf/refactor-deprecated-co-client 
NEW Removed deprecated CommonObject::client property
 2016-04-21 01:49:12 +02:00
Laurent Destailleur
429be4678c Merge pull request #5045 from bafbes/abb-16 
fix:erroneous nesting form
 2016-04-21 01:23:37 +02:00
Laurent Destailleur
6d2df1f6ea Merge pull request #5007 from altatof/fichinter_order_by_date 
NEW: fichinter lines ordered by rang AND DATE
 2016-04-19 19:26:57 +02:00
abb
c77e121553 fix:use of function updateExtrafield instead of insertExtrafields in interventions 2016-04-19 08:17:57 +01:00
abb
e673c1aad9 fix:erroneous nested form 2016-04-19 08:08:35 +01:00
Marcos García de La Fuente
e2c86d3fd8 NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead 2016-04-17 15:24:22 +02:00
Christophe Battarel
1676595b93 NEW: fichinter lines ordered by rang AND DATE 2016-04-14 10:50:32 +02:00
Laurent Destailleur
086345490d Generalize the set of trackid for everyemail sent by dolibarr. 2016-04-07 14:29:07 +02:00
Laurent Destailleur
5101c96223 Restore button to create object from the project view. 2016-04-04 15:25:08 +02:00
Laurent Destailleur
97b5026ad8 Uniformize code and css 2016-04-01 16:18:45 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d Revert "Corrected non-static usages of Form::selectarray function" 
This reverts commit 87cd6e1e40.
 2016-03-25 15:34:37 +01:00
Laurent Destailleur
8ecfca5a9e Revert change that break compatiblity with 100% of modules 2016-03-25 15:26:46 +01:00
Marcos García de La Fuente
89bd173c2f NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate 2016-03-21 21:51:29 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
ff6b187ef3 NEW Converted Form::showLinkedObjectBlock to a static function 2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
87cd6e1e40 Corrected non-static usages of Form::selectarray function 2016-03-20 14:15:17 +01:00
abb
42eba7270d new:constant FICHINTER_WITHOUT_DURATION to handle interventions without duration in lines 
Conflicts:
	htdocs/fichinter/card.php
 2016-03-13 19:49:30 +01:00
Laurent Destailleur
2e1a63a1f3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/langs/de_DE/companies.lang
	htdocs/langs/fr_FR/compta.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/commerciaux.php
	htdocs/societe/consumption.php
 2016-03-10 15:09:30 +01:00
Laurent Destailleur
3b035819a9 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
	htdocs/product/document.php
	htdocs/societe/commerciaux.php
 2016-03-10 15:03:53 +01:00
Laurent Destailleur
446a080c75 NEW Mutualize code to manage email substitution variables. Show 
available variables into page to edit email templates.
 2016-03-05 12:20:58 +01:00
Regis Houssin
f9d8aba325 Fix: wrong modelpdf var name 2016-03-04 11:48:46 +01:00
abb
f9162aa444 new:advanced permissions to validate and unvalidate interventions 2016-02-29 19:16:09 +01:00
Laurent Destailleur
274caf61eb NEW Add statistics for interventions module 2016-01-25 13:34:05 +01:00
Laurent Destailleur
8653e7fa5c Merge remote-tracking branch 'origin/3.9' into develop 2016-01-10 00:12:51 +01:00
Juanjo Menent
66c5d7c9ce Merge pull request #4150 from defrance/patch-84 
Add date start and end of intervention
 2016-01-09 17:56:39 +01:00
Laurent Destailleur
99f3870ee6 Fix no picot if no warehouse set 
Fix search on warehouse
 2016-01-08 23:54:40 +01:00
BENKE Charlie
2405276a36 Update card.php 2015-12-15 11:54:00 +01:00
philippe grand
01c6728aa9 [Qual] Uniformize code 2015-12-08 11:35:08 +01:00
BENKE Charlie
02f4c9879b Update card.php 2015-12-05 10:16:56 +01:00