lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
68,848 Commits 43 Branches 150 Tags 886 MiB
f8b0e535fa
Commit Graph

1034 Commits

Author SHA1 Message Date
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
da5228aaa9 Selection of fields ok for interventions 2016-07-06 10:28:34 +02:00
Laurent Destailleur
10885f0cf2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-06 09:58:15 +02:00
Laurent Destailleur
525b2cf297 Fix: Edition of contract on intervention failed 2016-07-02 12:02:51 +02:00
Laurent Destailleur
c8c51dd96d Fix clone of intervention was not cloning lines. 2016-07-01 19:15:30 +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
5db6bcd4a8 Fix contextpage lost on submitting form or sorting 2016-06-07 14:06:00 +02:00
Laurent Destailleur
1748da6c56 Merge 2016-06-04 14:51:56 +02:00
Laurent Destailleur
c8a8474b69 Better practice in boolean comparison 2016-05-17 23:19:57 +02:00
Juanjo Menent
143a70c893 Merge pull request #5078 from atm-maxime/new_stats_on_home 
New stats on home (contacts and interventions)
 2016-04-29 11:57:44 +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
Maxime Kohlhaas
4e42e73f60 New add stats on interventions 2016-04-23 13:16:19 +02:00
Laurent Destailleur
bfc5be1aad FIX Fix and move dolGetFirstLine function into main 
FIX Hang on ->client not defined
 2016-04-22 19:07:32 +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
e1bec46a34 FIX The include file for action on files should not be a template file 
but an action include file.
 2016-04-02 14:16:16 +02:00
Laurent Destailleur
97b5026ad8 Uniformize code and css 2016-04-01 16:18:45 +02:00
Laurent Destailleur
2d9c53fc26 NEW Merge all boxes "related objects" into one. This save a lot of room 
on most card and avoid often horizontal scoll.
 2016-03-30 19:18:31 +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
9796b1b268 Can select number of records into lists 2016-02-16 17:43:05 +01:00
Laurent Destailleur
158906455a NEW Can change dynamically number of records visible into lists. 2016-02-11 20:40:33 +01:00
Laurent Destailleur
9da0164d90 Uniformize code for lists 2016-02-07 15:50:48 +01:00
Laurent Destailleur
55c3728923 Merge pull request #4540 from defrance/patch-97 
bad id on restricted aera
 2016-02-02 15:56:54 +01:00
Laurent Destailleur
26cd0ac0c6 Fix duplicate field 2016-01-31 13:19:08 +01:00
BENKE Charlie
d75a20c589 bad id on restricted aera 2016-01-30 17:30:06 +01:00
Laurent Destailleur
08b3b0cf19 Merge remote-tracking branch 'origin/3.9' into develop 2016-01-28 23:50:23 +01:00
Laurent Destailleur
99b2236260 FIX Selection of project must no show closed project 2016-01-28 12:19:13 +01:00
Laurent Destailleur
df4cd3de17 FIX Selection of project must no show closed project 2016-01-28 12:05:14 +01:00
Laurent Destailleur
274caf61eb NEW Add statistics for interventions module 2016-01-25 13:34:05 +01:00
Laurent Destailleur
0f5e208127 Merge remote-tracking branch 'origin/3.9' into develop 2016-01-13 20:43:49 +01:00
Laurent Destailleur
2c24094d60 Fix bad tab on bad home area page 2016-01-13 13:54:11 +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
Laurent Destailleur
ed3f0ce86b Fix totalnboflines not correctly managed 2015-12-28 00:20:48 +01:00
philippe grand
1eeee203d7 [Qual] comments should be in english 2015-12-22 09:37:27 +01:00
Laurent Destailleur
db7a98f0ef Fix: When a payment mode was disabled, it was not visible on old 
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
 2015-12-21 13:56:59 +01:00
Laurent Destailleur
fa277ef634 Fix duplicate translation 2015-12-20 20:11:29 +01:00
Laurent Destailleur
9973315a07 Fix we muste have ($limit = $conf->liste_limite; $offset = $limit * 
$page) and not ($offset = $conf->liste_limite * $page).
In a future $limit that could be overwrite from search post form.
 2015-12-16 19:38:40 +01:00
BENKE Charlie
2405276a36 Update card.php 2015-12-15 11:54:00 +01:00
BENKE Charlie
ad7c90fc19 Update fichinter.class.php 2015-12-15 11:52:11 +01:00
philippe grand
2cd49043a6 [Qual] Close database handler should be after Footer 2015-12-11 19:37:12 +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
BENKE Charlie
7ea3df4d06 add date start and end of intervention 
add dateo (date open/start) and datee (date end) of intervention
this date are filled by the fichinterdet date and can be displayed on planning
 2015-12-04 11:28:28 +01:00
BENKE Charlie
f3ff8c5951 add dates of intervention 2015-12-04 11:25:07 +01:00
BENKE Charlie
bf9cb46aad update dateo and datee based on fichinterdet 
we update fields datee and dateo based on fichinterdet
like this we can show on fichinter the start and the end of the intervention
 2015-12-04 11:16:49 +01:00
Bahfir Abbes
fb692f4cd5 Update card.php 2015-12-03 19:10:15 +01:00
Bahfir Abbes
5360ea65bf Update card.php 2015-12-01 21:26:04 +01:00
abb
46611908ae add constant FICHINTER_EMPTY_LINE_DESC to allow empty line descriptions in interventions 2015-12-01 11:10:05 +01:00
Laurent Destailleur
c55d11869b Billing of supplier or customer order is a process that can be done in 
parallel with shipment or reception, so we show the status on another
field into lists.
 2015-11-29 15:54:32 +01:00
Laurent Destailleur
2a345b6fc0 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/admin/company.php
	htdocs/admin/menus/edit.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
 2015-11-21 12:48:41 +01:00
fmarcet
0a92849de3 FIX: Can't update line's duration 2015-11-16 10:57:47 +01:00
Laurent Destailleur
ab177b43af Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php
 2015-11-13 12:35:10 +01:00
Laurent Destailleur
93be4305c4 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/card.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/fichinter/card.php
	htdocs/societe/rib.php
 2015-11-13 12:18:46 +01:00
Laurent Destailleur
b2285ca5e0 Option MAIN_EMAIL_ADD_TRACK_ID is now set to 1 by default. 
All emails sent from Dolibarr have a dedicated tracking id.
 2015-11-12 21:25:01 +01:00
Regis Houssin
52bd90f950 Fix: wrong var name 2015-11-12 14:12:56 +01:00
Laurent Destailleur
2c682022cf NEW The search box and the bookmarks are now rendered by the menu 
manager.
 2015-10-30 09:36:57 +01:00
Laurent Destailleur
81580f75b9 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture.php
 2015-10-18 21:22:42 +02:00
Laurent Destailleur
420bfd8301 FIX Preview pages was not using correct style for ref 2015-10-18 19:09:35 +02:00
Laurent Destailleur
c51bc09e39 FIX The preview of PDF was never refreshed if PDF document was changed 2015-10-18 18:54:54 +02:00
Laurent Destailleur
2122d4d43a NEW Contract module can be used to follow both sold and bought 
contracts/recurring subscriptions.
 2015-10-17 00:52:35 +02:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Laurent Destailleur
1f742c7464 FIX Add a test to save life when ref of object (invoice ref, order ref, 
...) was empty. The was no way to go back to a clean situation, even
after vaidating again the object.
 2015-10-06 16:38:27 +02:00
frederic34
f2d7523091 Optioncss 2015-10-04 12:31:32 +02:00
frederic34
9a021e6de4 Optioncss not kept in list 2015-10-04 10:45:57 +02:00
Florian HENRY
fecd213bb8 FIX: display error on extrafields on ficheinter 2015-09-29 16:57:05 +02:00
Laurent Destailleur
62792c08eb Merge pull request #3591 from GPCsolutions/inherited 
[Qual] Cleanup of inherited class properties
 2015-09-26 11:23:59 +02:00
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
dabfad1529 [Qual] Replaced deprecated print_titre() 2015-09-24 18:27:13 +02:00
Laurent Destailleur
36632593c0 Fix SQL injections #3300 2015-09-12 11:36:19 +02:00
Laurent Destailleur
5bc74ad6ea Fix SQL injections #3300 2015-09-12 11:23:44 +02:00
BENKE Charlie
573773d95d Add fichinter area 
add fichinter area
 2015-08-15 21:22:43 +02:00
fmarcet
bd46f87ed8 FIX: Missing interventions headers 2015-07-29 13:04:12 +02:00
Laurent Destailleur
5ca6593a57 Fix serious deadlock feature. It was possible to link with no way to 
unlink. What if user make a bad click ? I complete feature with
reverse action to be sure to not have users with a corrupted situation.
 2015-07-28 14:13:16 +02:00
Laurent Destailleur
e31af7f914 Can filter list of setup constant on name and extend visibility to all. 2015-07-12 18:05:56 +02:00
Laurent Destailleur
5fafb08f91 Uniformize code 2015-07-04 04:11:16 +02:00
Laurent Destailleur
4a1dfa60a5 Uniformize code 2015-06-30 13:14:19 +02:00
Laurent Destailleur
dc050d39eb Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/adherents/type.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/js/lib_batch.js
	htdocs/core/modules/modUser.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/societe/consumption.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
	htdocs/user/perms.php
 2015-06-29 00:09:28 +02:00
aspangaro
9d2e964b00 Fix: print_liste_field_titre(''); 2015-06-26 06:23:29 +02:00
Regis Houssin
3807fafc1a Fix: no error message if extrafield is require 2015-06-16 16:42:33 +02:00
Juanjo Menent
0596be1656 Merge pull request #3008 from hregis/develop_strict 
Fix: ereg more simple
 2015-06-12 21:24:13 +02:00
Laurent Léonard
a337b6f874 Rename "duree" property of interventions to "duration" 
This also fixes the display problem of total duration on the "soleil" document model
 2015-06-11 23:18:29 +02:00
Regis Houssin
e3d1614004 Fix: ereg more simple 2015-06-11 09:21:44 +02:00
Laurent Destailleur
9b7982bf0c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/fourn/facture/card.php
	htdocs/theme/eldy/style.css.php
 2015-06-08 18:28:50 +02:00
Laurent Destailleur
e9526066b7 Prepare edition of field "bydefaultinlist" for extrafields. 2015-06-08 14:12:57 +02:00
Laurent Destailleur
a85f664b7a Merge pull request #2950 from defrance69/patch-64 
if duration is present on service, we use it
 2015-06-08 10:35:23 +02:00
BENKE Charlie
bcf9bdc92e Update card.php 
new setting vars FICHINTER_USE_SERVICE_DURATION
 2015-06-07 23:18:51 +02:00
Laurent Destailleur
02dbe16366 Mutualize code to show block to link an element to another one. 2015-06-06 15:57:59 +02:00
Regis Houssin
9a812a6c28 Fix: add filter for "dol_most_recent_files" for avoid conflict with 
option "Save file on server with name "FA0700034-Original filename""
 2015-06-06 13:03:02 +02:00
Laurent Destailleur
f42065146a Start to clean html.form class. 2015-06-06 12:26:47 +02:00
BENKE Charlie
2164729bad if duration is present on service, we use it 
not logic to entered always 1h
 2015-06-04 13:34:08 +02:00
Laurent Destailleur
5937cd7f70 NEW Forms are using the tab look, even in creation mode. 2015-05-13 17:53:25 +02:00
Laurent Destailleur
100fa1067e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php
 2015-04-22 17:57:57 +02:00
jfefe
25812f0071 Add picto for commercial pages titles 2015-04-18 23:17:44 +02:00
jfefe
c905f88498 Change generic and setup image title 2015-04-18 23:13:48 +02:00
Florian HENRY
f2018b7946 fix bug #2652 2015-04-18 22:59:20 +02:00
Marcos García de La Fuente
e2e6049c7f Copyright 2015-04-18 20:50:03 +02:00
Marcos García de La Fuente
c07e26dcac Merge branch 'develop' into fr-2613 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-04-18 20:42:57 +02:00
Marcos García de La Fuente
dc790ff586 NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +02:00
Florian HENRY
b7191a541c All send email card works with model choice box 2015-04-18 17:15:36 +02:00
Marcos García de La Fuente
de494b2904 Fix Bug #2579: Bad display duration enter data on intervention 2015-04-18 11:25:15 +02:00
Laurent Destailleur
56a14da5d4 FIXME that are not bug are replaced with TODO 
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
 2015-04-12 04:01:28 +02:00
Laurent Destailleur
6fa0234409 Uniformize code 2015-04-07 03:00:11 +02:00
Marcos García de La Fuente
4349f27299 Revert "Revert "Refactor 1"" 2015-03-23 01:39:12 +01:00
Laurent Destailleur
2d90256640 Revert "Refactor 1" 2015-03-22 12:51:29 +01:00
Laurent Destailleur
a79a779b04 Merge pull request #2456 from marcosgdf/refactor-1 
Refactor 1
 2015-03-22 12:47:05 +01:00
Laurent Destailleur
cd2fc2f890 Hooks 'printLeftBlock' and 'formConfirm' are now compliant with hook 
development rules. They are "addreplace" hooks, so you must return
content with"->resprints='mycontent'" and not with "return 'mycontent'"
 2015-03-18 14:31:37 +01:00
aspangaro
d69f066735 QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
Marcos García de La Fuente
4c08d34bb5 Standardized $rowid as property 2015-03-04 10:37:46 +01:00
Laurent Destailleur
b888a04af9 Reduce a lot of duplicate code. Move all tables of extrafields setup 
into a tpl file.
 2015-02-28 20:14:26 +01:00
Laurent Destailleur
8e26c71fa7 Rewrite code for supplier order and invoice to use shared code of 
customer supplier and invoice.
Work on extrafield for supplier order and invoice.
 2015-02-28 04:59:27 +01:00
Laurent Destailleur
011d39105d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/admin/export.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/datepicker.php
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/fourn/facture/card.php
 2015-02-07 03:28:36 +01:00
Laurent Destailleur
f865534b4c Fix some pdf differences 2015-02-03 13:43:37 +01:00
frederic34
6a1865adb6 Merge remote branch 'upstream/develop' into tooltip 
Conflicts:
	htdocs/fourn/commande/list.php
 2015-01-31 09:58:41 +01:00
Laurent Destailleur
275e198041 New: Selection of project use the new select2 component. 2015-01-30 19:57:38 +01:00
frederic34
736bee565c Tooltip everywhere 2015-01-30 16:40:33 +01:00
frederic34
e18577aa62 Tooltip and lib for file cache 2015-01-24 21:46:05 +01:00
frederic34
f4161b457b Add dol_escape_htmltag and start to adapt boxes 2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3 Add tooltip in getNomUrl link 2015-01-20 21:40:33 +01:00
Laurent Destailleur
e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/custom/.gitignore
	htdocs/expedition/card.php
	htdocs/fourn/card.php
	htdocs/product/fournisseurs.php
 2015-01-18 18:44:22 +01:00
Laurent Destailleur
5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/adherents/fiche.php
	htdocs/comm/fiche.php
	htdocs/comm/mailing/fiche.php
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/paiement.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/core/tpl/login.tpl.php
	htdocs/expedition/fiche.php
	htdocs/fourn/commande/fiche.php
	htdocs/fourn/facture/fiche.php
	htdocs/fourn/facture/paiement.php
	htdocs/fourn/fiche.php
	htdocs/main.inc.php
	htdocs/product/fournisseurs.php
	htdocs/resource/card.php
 2015-01-18 17:13:42 +01:00
Marcos García de La Fuente
cc9197e4c8 Fixed problem with Fichinter::getNextNumRef 2015-01-17 19:13:38 +01:00
Marcos García de La Fuente
41e01a22a3 Fixed loading of external numeration modules in Contrat, Commande, Facture, Contrat, Expedition, Fichinter, CommandeFournisseur and uniformized code 2015-01-17 18:58:05 +01:00
BENKE Charles
b6b84e235c Update card.php 
hide line with empty duration if FICHINTER_HIDE_EMPTY_DURATION is activate
 2015-01-12 10:16:34 +01:00
frederic34
60661ae948 Add some "classfortooltip" 2015-01-09 00:07:54 +01:00
BENKE Charles
da0d0838e2 Update card.php 
don't show line with empty duration when FICHINTER_HIDE_EMPTY_DURATION is active
 2014-12-28 13:20:51 +01:00
Laurent Destailleur
5ead994955 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-26 04:57:55 +01:00
Marcos García de La Fuente
1f00794c98 Fixed bug which didn't show documents in auto GED when an object had '/' in its ref 2014-12-25 21:47:39 +01:00
Laurent Destailleur
34ef373b3a Fixed: Filter lost with navigation 2014-12-25 12:00:49 +01:00
Laurent Destailleur
a111c4765c Fixed: Filter lost with navigation 2014-12-23 18:00:14 +01:00
Laurent Destailleur
2a3bb96c34 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ecm.lib.php
 2014-12-22 03:14:22 +01:00
Laurent Destailleur
8996953077 Fix: error reported by scrutinizer 2014-12-20 15:42:03 +01:00
Laurent Destailleur
8ad0974662 Merge pull request #2153 from defrance69/patch-33 
Update card.php
 2014-12-18 22:42:00 +01:00
BENKE Charles
729134aad4 Update card.php 
add INTERVENTION_ADDLINE_FREEDUREATION in update line too
 2014-12-14 17:04:56 +01:00
BENKE Charles
83d3ee45ee Update fichinter.class.php 
simplify the libstatut management and allow enhancing mode
 2014-12-14 14:44:28 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Frédéric FRANCE
b396ccaf73 Update /fichinter/list.php 2014-11-23 17:43:36 +01:00
Marcos García de La Fuente
7a272afd12 Fixed [ bug #1595 ] Selected boolean extrafield in intervention creation page, does not save state 2014-11-23 16:03:49 +01:00
Frédéric FRANCE
b43f8eede3 Update /fichinter/list.php 2014-11-23 09:32:46 +01:00
Laurent Destailleur
432b623dac Merge pull request #2041 from aspangaro/1684 
#1684 Clear sort filter works partially in interventions list
 2014-11-22 15:54:38 +01:00
aspangaro
4d48205e45 #1657 Intervention preview date is not displayed 2014-11-20 06:01:08 +01:00
Laurent Destailleur
8b0a9d78bb Fix: CRLF 2014-11-18 19:03:02 +01:00
aspangaro
86e624c3bc #1684 Clear sort filter works partially in interventions list 2014-11-17 21:31:18 +01:00
Laurent Destailleur
83d441f8ff Show field alwayseditable 2014-11-07 22:24:52 +01:00
aspangaro
f3d7da8feb Merge remote-tracking branch 'Upstream/develop' into develop-search 2014-11-03 20:25:36 +01:00
Laurent Destailleur
54e2803926 Missing search table for interventions 2014-11-03 17:48:10 +01:00
aspangaro
3ee4cfe30b Intervention card list 2014-11-03 05:57:09 +01:00
Laurent Destailleur
5086450f35 Fix: Forging email content must use dol_concatdesc. 2014-11-02 12:32:38 +01:00
Laurent Destailleur
6f77dc83c4 Qual: Uniformize code and fix a ton of bugs. 2014-10-27 03:24:45 +01:00
Laurent Destailleur
8e63f09764 Fix: Confirm validate must be set on yes by default. 2014-10-20 23:37:28 +02:00
Laurent Destailleur
0fba70d4d1 Fix: Triggers sending email for intervention and classify billed 2014-10-20 11:35:34 +02:00
Laurent Destailleur
718b3b19b4 Fix: user and date modification not updated 2014-10-20 11:16:51 +02:00
Laurent Destailleur
ad0f842b60 Merge branch 'mkoevols' of github.com:atm-maxime/dolibarr into 
atm-maxime-mkoevols

Conflicts:
	htdocs/commande/card.php
 2014-10-18 15:38:49 +02:00
Laurent Destailleur
f1e4f35471 Minor fixes on intervention sql 
No style on view for one day.
 2014-10-17 13:09:18 +02:00
Laurent Destailleur
7988532e4e Fix: Bad closing tab on preview pages. 2014-10-17 12:56:54 +02:00
Maxime Kohlhaas
ee4b807a5d Qual : refactoring extrafields display on objects into a single tpl file 2014-10-14 17:00:06 +02:00
Regis Houssin
a2446e51db New: add context "globalcard" for declaring only once all cards 2014-10-06 07:20:58 +02:00
Laurent Destailleur
3b6c533b85 Fix translation 2014-10-05 05:13:46 +02:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name" 
everywhere.
 2014-10-04 17:20:17 +02:00
Laurent Destailleur
ec95aacd52 Uniformize code for error reporting after a hook. 2014-09-28 03:41:32 +02:00
Laurent Destailleur
4244979f4f Fix: doxygen 
Fix: td balance
 2014-09-28 02:46:20 +02:00
Laurent Destailleur
14ab409ca9 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/stock.php
	htdocs/admin/system/index.php
	htdocs/comm/fiche.php
	htdocs/core/lib/admin.lib.php
	htdocs/core/lib/holiday.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/login/functions_forceuser.php
	htdocs/core/login/functions_http.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/filefunc.inc.php
	htdocs/holiday/define_holiday.php
	htdocs/opensurvey/fonctions.php
	htdocs/societe/canvas/actions_card_common.class.php
	test/phpunit/CompanyBankAccountTest.php
	test/phpunit/ExportTest.php
	test/phpunit/FactureTest.php
	test/phpunit/FunctionsLibTest.php
	test/phpunit/PropalTest.php
	test/phpunit/SocieteTest.php
	test/phpunit/WebservicesInvoicesTest.php
	test/phpunit/WebservicesThirdpartyTest.php
 2014-09-28 02:14:32 +02:00
Laurent Destailleur
5fdd798e91 Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on 
parameter).
 2014-09-27 17:13:15 +02:00
Laurent Destailleur
cff713ad07 Fix: var not initialized 2014-09-24 17:43:38 +02:00
fmarcet
63c6bd5d17 New: Added hook "formConfirm" and "doActions" for fichinter card 2014-09-24 13:28:59 +02:00
Laurent Destailleur
e163b0237f Merge branch 'develop' of github.com:aspangaro/dolibarr into 
aspangaro-develop

Conflicts:
	htdocs/fichinter/card.php
 2014-09-22 23:39:26 +02:00
Laurent Destailleur
08d4195504 Merge branch 'develop' of github.com:aspangaro/dolibarr into 
aspangaro-develop

Conflicts:
	htdocs/fichinter/card.php
 2014-09-22 23:34:56 +02:00
Laurent Destailleur
f7f0059767 Missing hook to add button on intervention 
Prepare to move location into resource
Can select which king of contact show into contact tab.
 2014-09-22 20:16:58 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
Laurent Destailleur
ae3240bad8 Fix: List of status does not match status into class. 2014-09-18 09:24:10 +02:00
Laurent Destailleur
bfb923f54b Fix: Solve conflict of translation key 2014-09-18 08:58:47 +02:00
Laurent Destailleur
ba67483421 Fix: too much field into list when option FICHINTER_DISABLE_DETAILS is 
on.
 2014-09-18 00:48:53 +02:00
Laurent Destailleur
06dbc4e36c Qual: Uniformize var $backtopage (no more $backtourl vars) 2014-09-15 19:14:10 +02:00
Laurent Destailleur
9ea3e33f94 Fix: Can edit status of event. 
New: Onto event summary of elements, end date and status are visible.
 2014-09-15 19:04:30 +02:00
Laurent Destailleur
0d6d064e7e New: PDF event report show project and status of event 
Fix: Can edit description of intervention
New: Show status of object on refere page.
 2014-09-15 12:48:24 +02:00
Laurent Destailleur
012643a892 New: Can filter on status on interventions. 2014-09-06 19:10:59 +02:00
Laurent Destailleur
643fc6c61f Fix: Bad use of fetch_lines 
Conflicts:
	htdocs/comm/propal.php
	htdocs/contrat/fiche.php
	htdocs/opensurvey/class/opensurveysondage.class.php
 2014-09-04 19:03:48 +02:00
Laurent Destailleur
cd00ec29bf Fix: Dictionnary with one n 
Conflicts:
	htdocs/expedition/fiche.php
 2014-09-04 19:00:28 +02:00
Laurent Destailleur
73ad0f9302 Fix: Bad use of fetch_lines 2014-09-04 18:58:33 +02:00
Laurent Destailleur
a9fb86e506 Fix: Dictionnary with one n 2014-09-04 18:41:28 +02:00
Laurent Destailleur
782aaf52ae Add method setEventMessages (can deal this->error and this->errors) 2014-09-04 14:39:18 +02:00
Laurent Destailleur
a87314f732 Merge pull request #1854 from dsthode/develop 
Contract never shown on interventions
 2014-09-02 19:46:49 +02:00
Laurent Destailleur
0ccd29c6cd Doxygen 2014-08-30 20:05:16 +02:00
Damian Serrano Thode
4fe83ebbf9 Contract never shown on interventions 
Column fk_contrat is never read from the database, so it is never shown
in the corresponding field of the intervention, even though you have set
it choosing the contract from the dropdown.
 2014-08-29 11:34:07 +02:00
Laurent Destailleur
8bdf02b340 Doxygen 2014-08-28 14:48:16 +02:00
Alexis Algoud
7af788729b debug extrafield on create card 2014-08-26 17:25:13 +02:00
Alexis Algoud
35fca84f19 ok on insert 2014-08-26 17:08:03 +02:00
Alexis Algoud
40aadc8125 add extrafield in add form 2014-08-26 12:11:34 +02:00
Alexis Algoud
85228fd8e7 add support in admin 2014-08-26 11:50:02 +02:00
Alexis Algoud
8e6a40d475 FIX error sql on update ficheinter 2014-08-23 14:34:48 +02:00
Alexis Algoud
a353f816e3 FIX error sql on update ficheinter 2014-08-23 14:33:49 +02:00
Raphaël Doursenaud
1d5fb1320b Fix: missing global declarations 2014-08-20 19:03:58 +02:00
Laurent Destailleur
25cc27c857 Qual: Remove method SetBilled that is a duplicate of setStatus. 
Fix: Better management of option SendInterventionRef.
 2014-08-15 23:20:31 +02:00
Laurent Destailleur
2eb01cfbf9 Squelette plus complet. 2014-08-15 21:18:56 +02:00
KreizIT
c94c0699d8 Fix : [ bug #1549 ] Itïs not possible add ExtraFields 2014-08-06 17:38:44 +02:00
Maxime Kohlhaas
94fee7af70 Call trigger added in commonobjectline 2014-08-01 08:59:08 +02:00
Maxime Kohlhaas
d8ede4147d Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-07-31 11:55:36 +02:00
Laurent Destailleur
86b410ab22 Merge pull request #1780 from icfr/develop 
order task on pdf
 2014-07-30 11:36:29 +02:00
Maxime Kohlhaas
d8cf23ad95 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-07-29 15:46:50 +02:00
icfr
c80d1285e3 order task on pdf 2014-07-29 07:11:25 +02:00
Laurent Léonard
0228cd9db7 Fix translations in e-mail forms 2014-07-28 02:45:58 +02:00
Maxime Kohlhaas
393f32097b class fichinterligne was not extending common object => error with trigger call 2014-07-25 13:57:41 +02:00
Marcos García de La Fuente
4f4ac30fc0 Deprecating arbitrary use of dol_htmloutput* functions 2014-07-20 02:32:13 +02:00
Marcos García de La Fuente
43597c1731 Migrated old error notifications to the """new""" system 2014-07-20 01:43:46 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
Laurent Destailleur
ad4babb154 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	.travis.yml
	htdocs/fichinter/fiche.php
 2014-07-08 01:12:55 +02:00
Laurent Destailleur
90a5f6c7ef Qual: Remove end php tag. 2014-07-08 01:02:30 +02:00
Laurent Destailleur
56c067f15c Fix: form is not allowed inside a table 
Conflicts:
	htdocs/fichinter/fiche.php
 2014-07-06 21:16:27 +02:00
Laurent Destailleur
f43dd6c834 Fix: form is not allowed inside a table 2014-07-06 21:12:16 +02:00
Laurent Destailleur
be4fe3d0d0 Merge branch 'syslog' of github.com:marcosgdf/dolibarr into 
marcosgdf-syslog

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/projet/class/project.class.php
	htdocs/projet/class/task.class.php
 2014-07-04 13:43:50 +02:00
KreizIT
174edb6140 FIX: Intervention trigger 2014-07-03 14:57:16 +02:00
Marcos García de La Fuente
7e1cf124b8 Merge branch 'develop' into syslog 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/lib/replenishment.lib.php
	htdocs/societe/soc.php
 2014-07-02 21:20:02 +02:00
Laurent Destailleur
03c6d8fdc3 New: Can create proposal from an intervention. 2014-06-28 19:47:51 +02:00
Laurent Destailleur
0e36295e12 Add option FICHINTER_DISABLE_DETAILS 2014-06-28 18:43:36 +02:00
Laurent Destailleur
a79aa1f203 Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop 
Conflicts:
	htdocs/product/class/product.class.php
 2014-06-26 21:38:03 +02:00
Laurent Destailleur
dce0c38533 Fix: Add hidden option so we can restore old behaviour (duration is 
free) for people that can't work with new one.
 2014-06-21 16:06:59 +02:00
Florian HENRY
9bb537f399 - New: If multilangue is enabled, mail (from propal, invoice, etc...) 
message is pre-defaulted in Customer language
 2014-06-18 09:59:15 +02:00
Maxime Kohlhaas
1250804e81 Fix 1490 $this instead of $object 2014-06-14 11:42:17 +02:00
Marcos García de La Fuente
56abf1cd72 Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
88cd5dec40 More substitutions 2014-06-13 01:42:00 +02:00
Marcos García de La Fuente
7e7958cf73 Removed SQL errors as they are logged by the database handler 2014-06-12 13:49:05 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Marcos García de La Fuente
ae4bd4445e Moved dol_syslog query log to the database handler and decreased report level to DEBUG 2014-06-09 15:49:54 +02:00
Laurent Destailleur
69eaefc459 Fix: The way we tested if a ref/id already exists was wrong. Introduce a 
common static method for this. Removed verifNumRef method.
Fix: Add missing logs
 2014-05-13 10:12:45 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
880f77b7e1 Fix: Preview feature 2014-04-30 13:50:25 +02:00