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
Laurent Destailleur
19d71ffb38
Prepare fix to hide images generated by "preview" feature.
2014-04-29 21:14:55 +02:00
Laurent Destailleur
cafa61ef7d
Fix: Use correct syntax of date into sql requests (with quotes)
2014-03-15 23:12:00 +01:00
Laurent Destailleur
1b85f83dbb
Merge pull request #1466 from marcosgdf/minor
...
Minor style and translation corrections
2014-03-13 11:53:52 +01:00
Laurent Destailleur
bdb2b7a547
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/projet/index.php
test/phpunit/FunctionsTest.php
2014-03-13 09:20:05 +01:00
Laurent Destailleur
ded5d47afc
Fix: multilangs array was not loaded.
2014-03-12 01:21:18 +01:00
Laurent Destailleur
86ad05c22e
Merge pull request #1461 from marcosgdf/unknown-error
...
Corrected Unknown error message typo
2014-03-11 11:54:08 +01:00
Marcos García de La Fuente
f9a451dbb9
Corrected intervention translation in module configuration page
2014-03-11 11:27:25 +01:00
Marcos García de La Fuente
fa56fe4e8b
Corrected Unknown error message typo
2014-03-10 19:36:32 +01:00
Laurent Destailleur
24b0ea6613
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/comm/propal.php
htdocs/compta/facture.php
htdocs/fourn/class/fournisseur.commande.class.php
2014-03-03 19:38:02 +01:00
Laurent Destailleur
b6cefee45a
Fix: [ bug #1240 ] traduction
2014-03-01 15:21:11 +01:00
Laurent Destailleur
2534da9a9f
Merge pull request #1422 from defrance69/patch-31
...
Update fiche.php
2014-02-24 10:33:40 +01:00
Laurent Destailleur
6f962397e4
Start to work on a mass send remind feature.
2014-02-19 20:23:02 +01:00
BENKE Charles
05865a7978
Update fiche.php
...
somme other error
2014-02-18 15:49:16 +01:00
BENKE Charles
64074305d3
Update fiche.php
...
double line
2014-02-18 15:22:45 +01:00
Laurent Destailleur
908c39098d
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/action/fiche.php
2014-02-16 19:47:51 +01:00
Laurent Destailleur
191ff05873
Fix: W3C.
2014-02-12 18:36:49 +01:00
Laurent Destailleur
ce8d13ead0
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/comm/action/fiche.php
htdocs/filefunc.inc.php
htdocs/install/check.php
2014-02-10 00:38:10 +01:00
Laurent Destailleur
5b89bc18f5
[ bug #1231 ] PDF always generated in interventions
2014-02-08 02:46:05 +01:00
Laurent Destailleur
1fd67807ce
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-18 01:13:29 +01:00
Grand Philippe
462f65614d
Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1
2014-01-13 10:10:17 +01:00
Laurent Destailleur
23eb0f3770
Qual: Mutualize code for actions of editing notes
...
New: Add button 'cancel' to cancel edition of a note (private or public)
2014-01-11 13:33:30 +01:00
Laurent Destailleur
dc754bbdc2
Fix: Trigger name conflicts and reference file was not matching real
...
name of triggers.
2013-12-14 20:48:34 +01:00
Laurent Destailleur
45b1273992
Fix: [ bug #1171 ] Documents lost in interventions after validating
2013-12-01 21:03:49 +01:00
Cédric Salvador
c885389ac6
included the FormContract class to avoid fatal error
2013-11-19 14:23:17 +01:00
Cédric Salvador
00c9df670c
renamed templates
2013-11-06 10:22:01 +01:00
Cédric Salvador
6c22af00e1
factorization
2013-11-06 10:20:54 +01:00
Cédric Salvador
c96b2d3b87
factorized form attach, documents list and links list for the document pages
2013-11-06 10:19:16 +01:00
Cédric Salvador
23008c3b31
factorized document actions
...
Conflicts:
htdocs/societe/document.php
2013-11-06 10:11:40 +01:00
Laurent Destailleur
628fbc7b7d
Fix: bad picto
2013-11-05 15:14:23 +01:00
Laurent Destailleur
223e50276c
Fix: Info tab was wrong with interventions
2013-11-05 14:24:37 +01:00
Laurent Destailleur
190dabc3f7
Fix: Tons of bugs with extrafields feature.
2013-11-05 13:11:36 +01:00
Laurent Destailleur
3fde695c94
Qual: Uniformise name of include files we use to share common code found
...
into Actions area of pages (controllers).
2013-09-23 13:22:28 +02:00
Cédric Salvador
fc136d0d06
changed parameter
2013-09-16 14:17:53 +02:00
Cédric Salvador
d9a26d0aa9
natural search in list pages
2013-09-16 14:17:53 +02:00
Laurent Destailleur
305c1d63a7
Qual: Uniformize code. No useless redirect. use GETPOST.
2013-09-06 13:25:45 +02:00
Laurent Destailleur
c151ef7b87
Qual: Remove duplicate form instanciation.
2013-09-06 12:10:09 +02:00
Raphaël Doursenaud
e762042828
Fixed typos
2013-09-05 18:06:51 +02:00
Laurent Destailleur
9da5f7f47a
Qual: Doxygen
2013-08-22 16:49:23 +02:00
Laurent Destailleur
c41a955cbe
Fix: Permissions on files
2013-08-06 00:36:04 +02:00
Laurent Destailleur
2bc650bf61
Qual: Remove tons of codesniffer errors and warnings.
2013-07-07 13:14:32 +02:00
Grand Philippe
b599481ef6
standardize code
2013-06-20 09:18:12 +02:00
Laurent Destailleur
c748f3d834
Qual: Removed useless methods
...
Qual: Removed deprecated vars
Qual: Free memory
2013-06-16 21:31:21 +02:00
Florian Henry
8fb2b8fa12
Start normalize project module : create html.formprojet.class.php with
...
selec_project
2013-06-14 22:33:01 +02:00
Laurent Destailleur
a50cd7b698
Fix bug into script that fix CRLF into LF
2013-06-12 11:59:55 +02:00
Laurent Destailleur
482a771e7c
Fix: Some quality fixes
2013-06-10 19:04:04 +02:00
BENKE Charles
b42a3a716d
Update fiche.php
...
change the call of select_contract function
2013-06-09 22:15:37 +03:00
Grand Philippe
db6d226ffd
code was displayed twice
2013-06-06 09:22:26 +02:00
Regis Houssin
c9a71439b2
Fix: EOF
2013-06-05 16:24:32 +02:00
Laurent Destailleur
2e1170297c
Merge pull request #1015 from defrance69/patch-17
...
Update fiche.php
2013-06-03 14:37:19 -07:00
BENKE Charles
d331596d19
Update fiche.php
...
Add contract link
2013-06-03 01:49:49 +02:00
BENKE Charles
949a2c0ac5
Update fichinter.class.php
...
add contract link
2013-06-03 02:43:12 +03:00
Christophe Battarel
ebb8171d28
fix bug when creating fichinter from order (create function should receive $user as parm)
2013-05-23 11:36:00 +02:00
Christophe Battarel
c69a44d6e9
fix wrong construction of description when creatin from orders (it was putting a mess on update)
2013-05-22 10:23:26 +02:00
Christophe Battarel
c97384d5db
restore UNIX type (LF)
2013-05-21 12:32:41 +02:00
Christophe Battarel
4b1ae9e9a9
add ability to include products on intervention card (some companies prefer to have both products and services on the intervention card that they give to their consultant)
2013-05-21 11:44:11 +02:00
Laurent Destailleur
12681994ea
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/fichinter/class/fichinter.class.php
htdocs/fichinter/fiche.php
2013-05-20 21:21:03 +02:00
fhenry
3d409390a5
Revert Class rewrite and ficheinter line trigger
2013-05-19 18:37:38 +02:00