Laurent Destailleur
f997d11761
Update card.php
2020-08-27 21:02:01 +02:00
Laurent Destailleur
7730569dff
Update card.php
2020-08-27 21:00:01 +02:00
Laurent Destailleur
9f8d1f0e63
Merge pull request #14520 from TobiasSekan/ShowUserOnExternalCalenderEvents
...
NEW Show user on external calender events (when found)
2020-08-27 20:10:13 +02:00
Laurent Destailleur
0309510ab8
Fix avoid duplicate event recorded from email collector
2020-08-27 18:50:08 +02:00
atm-lena
c0f254d10c
Translation + decode
2020-08-27 16:03:25 +02:00
atm-lena
e3ce3cbb7c
Function sendEmailsReminder()
2020-08-27 15:49:56 +02:00
atm-lena
f57325237a
WIP : sendEmailsReminder()
2020-08-27 12:30:59 +02:00
atm-lena
5856033892
Replace "agenda_send" and "event_push" to "actioncomm_send"
2020-08-27 11:15:08 +02:00
stickler-ci
b0fe7bc2e0
Fixing style errors.
2020-08-27 08:47:57 +00:00
atm-lena
4ef2644300
Use date.lib.php functions
2020-08-27 10:29:23 +02:00
atm-lena
9d1fc28eba
Fix type reminder "push" to "browser"
2020-08-27 09:35:02 +02:00
atm-lena
bbc554070c
Fix
2020-08-27 09:33:40 +02:00
atm-lena
6a60228bc3
Translation
2020-08-26 17:11:32 +02:00
atm-lena
efe60ebc58
Error management
2020-08-26 17:02:34 +02:00
atm-lena
cc29654f47
WIP : rename fk_project to fk_actioncomm + add line to sql file to install
2020-08-26 16:48:09 +02:00
atm-lena
a01d1b58c7
Add fk_email_template
2020-08-26 16:06:20 +02:00
atm-lena
cf9337b644
Add fk_project to actioncommreminder object
2020-08-26 15:58:14 +02:00
atm-lena
c10556473f
Clean
2020-08-26 15:35:12 +02:00
atm-lena
552e655668
Add field "entity" in actioncommrminder object and table
2020-08-26 15:22:32 +02:00
atm-lena
2fb5824836
Calcul date of reminder for event create
2020-08-26 15:12:08 +02:00
atm-lena
d3ac39589a
WIP
2020-08-26 12:48:12 +02:00
atm-lena
42f492877e
WIP
2020-08-26 11:36:32 +02:00
atm-lena
3046556d7b
Add checkbox "AddReminder"
2020-08-26 11:19:14 +02:00
atm-lena
a4018f41f7
WIP
2020-08-26 10:52:36 +02:00
atm-lena
7df993c7ed
Add "select_model_mail" function + add select to create event
2020-08-25 17:26:32 +02:00
atm-lena
94b2f3c5e1
Add $conf conditions
2020-08-25 12:57:36 +02:00
atm-lena
25840c2b3d
Create Event - Add fields
2020-08-25 12:40:29 +02:00
Sekan, Tobias
a7895f3496
Merge branch 'ShowUserOnExternalCalenderEvents' of https://github.com/TobiasSekan/dolibarr into ShowUserOnExternalCalenderEvents
2020-08-25 12:20:10 +02:00
Sekan, Tobias
4c851884e5
Address feedback
2020-08-25 12:16:44 +02:00
stickler-ci
a60968e95b
Fixing style errors.
2020-08-24 14:17:15 +00:00
Christian Foellmann
0e9677fd34
allow default settings for "cond_reglement_id" and "mode_reglement_id"
...
(cherry picked from commit 2e5475d181af2e8ceb6ea220424fd1329e72e342)
2020-08-24 16:08:44 +02:00
Laurent Destailleur
d23e83779f
Merge branch 'develop' into ParseTranspAndPrioFromExternalCalendar
2020-08-23 18:21:18 +02:00
Laurent Destailleur
053aa1b750
Merge pull request #14509 from TobiasSekan/ShowLocationOnImportCalenderEvents
...
NEW Show place from events on import calender
2020-08-23 18:11:02 +02:00
Laurent Destailleur
a265bec7ca
NEW Events in agenda for contact
...
FIX Saving contacts of an events
2020-08-23 02:38:56 +02:00
Laurent Destailleur
6ad18ceef0
Remove useless code
2020-08-21 19:48:31 +02:00
stickler-ci
183013e9ed
Fixing style errors.
2020-08-21 12:02:03 +00:00
Sekan, Tobias
9af5354dfe
Parse priority and transparency from external calender events
2020-08-21 13:57:03 +02:00
stickler-ci
61cce2e700
Fixing style errors.
2020-08-21 06:46:00 +00:00
Sekan, Tobias
22ff5a320f
fix not working external calender on/off
2020-08-21 08:40:23 +02:00
Sekan, Tobias
bb1452917b
fix wrong event percentage
2020-08-21 08:33:19 +02:00
Sekan, Tobias
ba98db934d
Show user on external calender events
2020-08-21 08:18:26 +02:00
Laurent Destailleur
ad0625b6ec
Debug posting message from ticket page
2020-08-21 01:11:22 +02:00
Sekan, Tobias
546571a6f8
Show place from events on import calender
2020-08-20 08:20:00 +02:00
Laurent Destailleur
7217dc3114
Better perf for phpunit on very large databases
2020-08-19 01:43:48 +02:00
Laurent Destailleur
964c4ef0d2
Standardize code. Use model_pdf.
2020-08-18 14:48:38 +02:00
Alexandre SPANGARO
27c36713d3
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-08-16 22:10:02 +02:00
Tim Otte
0e03578e91
Fixed translation of product units in documents
2020-08-04 11:51:40 +02:00
Laurent Destailleur
e455f8afa6
Merge pull request #14369 from Tim-Otte/fix-product-unit-translation
...
Fixed translation of product units in documents
2020-08-04 11:50:50 +02:00
Tim Otte
360afccecc
Fixed translation of product units in documents
2020-08-04 11:02:16 +02:00
Laurent Destailleur
4afdfdda53
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/card.php
2020-08-02 22:42:17 +02:00
Laurent Destailleur
66d4b7372e
FIX Look and feel v12
...
Conflicts:
htdocs/comm/card.php
htdocs/societe/tpl/linesalesrepresentative.tpl.php
2020-08-02 22:38:20 +02:00
Laurent Destailleur
87f71e7681
FIX Look and feel v12
2020-08-02 22:36:14 +02:00
kkhelifa-opendsi
fe0f77b967
Merge branch 'develop' into stcommcontact
2020-07-31 16:41:17 +02:00
Tim Otte
85c5f423b1
Added fetch_thirdparty (without the site crashes)
2020-07-29 12:55:58 +02:00
Tim Otte
c5816478d9
Added fetch_thirdparty (without the site crashes)
2020-07-28 11:14:55 +02:00
Laurent Destailleur
dd86c21382
FIX dolGetElementUrl and agenda page for external modules
2020-07-25 03:01:04 +02:00
Laurent Destailleur
46fccf8eb1
FIX dolGetElementUrl and agenda page for external modules
2020-07-24 11:53:44 +02:00
Laurent Destailleur
42234ba506
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/price.lib.php
2020-07-24 00:07:57 +02:00
VERDOL Gauthier
55298317e3
FIX : wrong link to third invoice templates
2020-07-20 16:22:48 +02:00
Abdessalam@MEGALOGI
1e6273b92d
Update card.php
...
La description d'un produit/service libre (HTML) d'un devis est formatée en texte simple.
2020-07-18 23:11:17 +02:00
Laurent Destailleur
8b5f4fe9a6
Fix massaction delete on events
2020-07-11 12:21:53 +02:00
Laurent Destailleur
b6452dbbc0
Merge pull request #14196 from Tim-Otte/fix-proposals-urgent
...
FIX: Hotfix for "Call to a member function getNomUrl() on null in comm/propal/card.php"
2020-07-10 02:51:25 +02:00
Laurent Destailleur
46119dc786
Fix per user
2020-07-09 12:49:48 +02:00
Laurent Destailleur
b2bd90ae1a
Fix link to list of event
2020-07-09 12:33:28 +02:00
Laurent Destailleur
9592fdb3fc
CSS
2020-07-09 11:55:16 +02:00
Laurent Destailleur
1dfd2d565b
FIX Reposition and nav
2020-07-08 18:18:47 +02:00
Laurent Destailleur
96d935832c
FIX Reposition and nav
2020-07-08 18:18:08 +02:00
Laurent Destailleur
5ea47f3ade
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/resultat/index.php
htdocs/product/admin/product.php
htdocs/projet/tasks/list.php
2020-07-08 18:11:58 +02:00
Laurent Destailleur
96729769f7
Standardize Agenda view
2020-07-08 18:06:14 +02:00
Tim Otte
a73f77cfef
Fixed same error like before
2020-07-07 12:43:15 +02:00
Laurent Destailleur
4fd970af28
Fix phpcs
2020-07-07 01:29:31 +02:00
Laurent Destailleur
14c98f277b
NEW Can change VAT rate of all lines of a draft object in one step.
2020-07-06 22:48:22 +02:00
Laurent Destailleur
f72a836231
Fix look and feel v12
2020-07-06 16:59:25 +02:00
Laurent Destailleur
4dcc073b3a
Fix param GETPOST
2020-07-06 16:54:30 +02:00
Laurent Destailleur
3939a640e9
Fix note in creation
2020-07-06 16:52:28 +02:00
stickler-ci
19eef8aa93
Fixing style errors.
2020-07-06 01:26:46 +00:00
Alexandre SPANGARO
59ee22537d
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-07-06 03:24:27 +02:00
Laurent Destailleur
83eaddb17b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/evalmath.class.php
htdocs/core/class/extrafields.class.php
htdocs/install/mysql/migration/11.0.0-12.0.0.sql
htdocs/langs/en_US/cashdesk.lang
htdocs/societe/class/societe.class.php
2020-07-04 13:13:17 +02:00
Tim Otte
bce0a93227
Hotfix for an error in v12
2020-07-03 00:33:54 +02:00
Laurent Destailleur
0ea55209ae
Merge pull request #14165 from ptibogxiv/patch-345
...
FIX non numeric value on comm/card.php
2020-07-03 00:24:32 +02:00
Regis Houssin
a5431a40da
FIX missing possibility to change entity when propal cloning
2020-07-02 10:16:20 +02:00
ptibogxiv
cc132775f3
FIX non numeric value on comm/car.php
2020-07-01 16:18:19 +02:00
Tim Otte
94a1d71fba
Hotfix for an error in v12
2020-06-30 15:20:30 +02:00
Laurent Destailleur
0aa08edb38
Merge pull request #14139 from OPEN-DSI/new-societe-card-set-sales-representative
...
NEW can edit and set sales representatives directly on thirdparty card
2020-06-28 21:08:24 +02:00
Laurent Destailleur
90d4458aab
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2020-06-27 00:38:51 +02:00
Laurent Destailleur
29ba9c82c3
Fix #14120
2020-06-26 17:17:13 +02:00
lvessiller
ad36447295
NEW can edit and set sales representatives directly on thirdparty card
2020-06-26 12:20:53 +02:00
Laurent Destailleur
333d4873c3
Properties ->contactid has been renamed into ->contact_id
2020-06-25 12:17:47 +02:00
Laurent Destailleur
18c23680f7
Fix bad object
2020-06-25 12:17:06 +02:00
Laurent Destailleur
ee5156034d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-24 20:03:40 +02:00
Laurent Destailleur
de62037ba5
Fix signed only in margin calculation of project
2020-06-24 12:58:10 +02:00
Laurent Destailleur
6d25b8630b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/prelevement.php
htdocs/core/class/rssparser.class.php
2020-06-23 11:38:20 +02:00
Laurent Destailleur
4d2cbf7006
Fix alert picto of expired services not visible
...
Fix CSS
2020-06-23 11:27:40 +02:00
Laurent Destailleur
501fd2f7a3
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/takepos/admin/receipt.php
2020-06-21 20:48:41 +02:00
Laurent Destailleur
bb3320f103
FIX #14104
2020-06-20 18:34:19 +02:00
Laurent Destailleur
c54294285a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
2020-06-20 12:28:14 +02:00
florian HENRY
7fef9a813e
fix warning and clean old code about multiselect category
2020-06-18 20:03:03 +02:00
Laurent Destailleur
4627f06c70
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-16 22:57:50 +02:00
Laurent Destailleur
b7d835eceb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-15 16:10:27 +02:00
Laurent Destailleur
40e16672e3
FIX BlindBoolean SQL injection reported by Christian Weiler
...
<sak1.s3curity@gmail.com>
2020-06-15 15:08:52 +02:00
Laurent Destailleur
90b5ed9908
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/website.lib.php
2020-06-11 23:41:35 +02:00
Laurent Destailleur
e94ef09977
css
2020-06-10 22:24:15 +02:00
Laurent Destailleur
8dbc0ff040
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/prelevement.php
htdocs/admin/system/phpinfo.php
htdocs/modulebuilder/index.php
2020-05-31 00:31:14 +02:00
Laurent Destailleur
94e02269ee
Fix: missing fk_project
2020-05-31 00:20:01 +02:00
Laurent Destailleur
ddebe1bbba
FIX Missing ref into popup
2020-05-30 23:52:47 +02:00
Laurent Destailleur
02bf646abe
FIX Missing ref into popup
2020-05-30 23:51:02 +02:00
stickler-ci
029f5570e5
Fixing style errors.
2020-05-28 12:55:29 +00:00
Supermanu
0baea21947
NEW Add mass deletion for events
...
Only users with the right `allactions->delete` will be able to mass delete.
2020-05-28 14:45:54 +02:00
Supermanu
721b99bb2f
Add calendar selection for agenda view
2020-05-28 11:24:37 +02:00
Frédéric FRANCE
e5402988d9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-24 17:58:18 +02:00
Laurent Destailleur
fd61214b97
Merge
2020-05-24 01:06:45 +02:00
Frédéric FRANCE
5c78eca68a
prepare new rule
2020-05-23 21:14:44 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule
2020-05-23 21:07:47 +02:00
Laurent Destailleur
127534ef55
Fix common var name seems to be $objref for subdir of doc
2020-05-23 20:09:31 +02:00
stickler-ci
66637ba0b6
Fixing style errors.
2020-05-23 16:39:06 +00:00
Frédéric FRANCE
2085ac73e7
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-23 18:34:58 +02:00
Laurent Destailleur
4e3fbb9d05
Merge pull request #13912 from TobiasSekan/NewEventMassactionPercent
...
NEW mass-actions for the event list view
2020-05-23 14:26:51 +02:00
Laurent Destailleur
7397806ae7
Update actioncomm.class.php
2020-05-23 14:26:28 +02:00
Frédéric FRANCE
b41ac00b98
add new rule
2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule
2020-05-21 01:41:27 +02:00
Laurent Destailleur
92cbff7749
Clean code
2020-05-20 23:40:04 +02:00
stickler-ci
f0bb7d233f
Fixing style errors.
2020-05-19 06:29:23 +00:00
Tobias Sekan
7fd6151c43
Add massactions for event list
2020-05-19 08:18:38 +02:00
Tobias Sekan
223224d12c
Add function to update the event percent + const
2020-05-19 08:07:21 +02:00
Laurent Destailleur
ff8d22a80d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/expedition/class/expedition.class.php
scripts/cron/cron_run_jobs.php
2020-05-18 15:57:01 +02:00
Laurent Destailleur
9336828710
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/paiement/card.php
htdocs/expedition/class/expedition.class.php
2020-05-18 15:54:39 +02:00
Laurent Destailleur
45345440a4
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/expedition/class/expedition.class.php
scripts/cron/cron_run_jobs.php
2020-05-18 15:50:36 +02:00
Maxime Kohlhaas
cf96383bf9
Fix : entity was missing in actioncomm fetch
2020-05-18 10:44:55 +02:00
Laurent Destailleur
ab07330668
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-05-14 16:34:45 +02:00
Laurent Destailleur
f5b9151f17
Merge pull request #13871 from FHenry/11.0
...
fix template email on propal list
2020-05-14 16:10:33 +02:00
Laurent Destailleur
136d002639
Merge pull request #13872 from simnandez/11.0
...
FIX: Do not show stats panel if the user does not have permissions
2020-05-14 16:09:37 +02:00
ptibogxiv
e1db0ef855
Update index.php
2020-05-12 10:57:51 +02:00
Juanjo Menent
66beb7c14f
FIX: Do not show stats panel if the user does not have permissions
2020-05-12 10:17:47 +02:00
florian HENRY
d9e26b8569
fix template email on prpal list
2020-05-12 08:38:03 +02:00
Laurent Destailleur
4584fa1aa6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/asset/list.php
htdocs/compta/bank/list.php
htdocs/contrat/services_list.php
htdocs/core/lib/date.lib.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/holiday/list.php
htdocs/projet/tasks/list.php
htdocs/supplier_proposal/list.php
htdocs/user/list.php
2020-05-11 19:43:06 +02:00
Laurent Destailleur
44d36815bd
Look and feel v12
2020-05-11 19:00:27 +02:00
Laurent Destailleur
42ee755ea5
Look and feel v12
2020-05-08 02:52:55 +02:00
Maxime Kohlhaas
1a9afe6b20
Fix missing hook params for printFieldListValue
2020-05-08 01:40:25 +02:00
Laurent Destailleur
206b16410e
Revert the option to avoid to introduce a feature that is duplicate with
...
already existing view "Events/Agenda". It also keeps a common behaviour
between other tools.
Maxi debug on messages of tickets
2020-05-07 22:52:32 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-02 01:39:56 +00:00
Laurent Destailleur
8208e81622
Merge pull request #13767 from indelog/statsbytype
...
Add possibility to filter stats by ThirdParty type and categorie
2020-05-01 22:05:06 +02:00
Laurent Destailleur
c27b3c5966
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
2020-04-30 18:49:20 +02:00
DEMAREST Maxime (Indelog)
790cffb7ae
Correct select label for categories in stats pages
2020-04-29 15:24:13 +02:00
DEMAREST Maxime (Indelog)
1bd9372022
Forgot comments to document news params for the modified methods
2020-04-29 10:00:29 +02:00
DEMAREST Maxime (Indelog)
40f1bed8d0
Add possibility to filter stats by ThirdParty type and categorie
2020-04-29 09:17:44 +02:00
kamel
4dd42496fa
Correction pour validation Stickler CI / stickler-ci
2020-04-27 17:48:05 +02:00
kamel
9cb90cb384
NEW: Add prospect status managment for the contact with managment of custom icon
2020-04-27 17:35:14 +02:00
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23
2020-04-27 14:14:13 +02:00
gauthier
7f56c4a785
FIX : Another "Access to undeclared static property: Contact::$table_element" && "Societe::$table_element"
2020-04-27 11:18:53 +02:00
Laurent Destailleur
4c605283f5
Fix phpcs
2020-04-27 00:09:21 +02:00
Laurent Destailleur
31157931a9
Fix phpcs
2020-04-26 23:52:23 +02:00
Laurent Destailleur
1121d2c1c6
Look and feel v12
2020-04-25 13:49:44 +02:00
Laurent Destailleur
7bbfd2175d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.dispatch.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/reception/class/reception.class.php
2020-04-24 18:58:47 +02:00
Laurent Destailleur
9679b1f04c
Merge pull request #13704 from frederic34/actioncomm_note
...
actioncomm note deprecated
2020-04-23 18:52:56 +02:00
Marc Guenneugues
94be1870ec
Clean line extrafields when deleting proposal
2020-04-23 18:02:53 +02:00
Laurent Destailleur
72c6ac1c72
Complete #13708 , normalization of code
2020-04-23 13:21:39 +02:00
Frédéric FRANCE
177008ab65
actioncomm note deprecated
2020-04-23 00:45:33 +02:00
Frédéric FRANCE
4220d6b253
actioncomm note deprecated
2020-04-23 00:38:42 +02:00
Laurent Destailleur
16e46c672c
Clean code
2020-04-20 15:06:27 +02:00
Laurent Destailleur
d847f67e45
Look and feel v12
2020-04-20 03:10:26 +02:00
Laurent Destailleur
5c18404083
Move to jquery 4.0.13 with fix in reponsive
...
Restore some files modified by error.
2020-04-18 15:15:35 +02:00
Laurent Destailleur
8f7c3fc867
Fix: restore jselect2 4.0.5 (4.0.6 create troubles in responsive)
2020-04-18 14:39:02 +02:00
Laurent Destailleur
47ff3f866a
css
2020-04-18 12:54:28 +02:00
Laurent Destailleur
7c6c600225
CSS
2020-04-18 11:38:24 +02:00
Laurent Destailleur
07ce3fc34d
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2020-04-18 11:08:21 +02:00
Laurent Destailleur
23876684cb
Responsive
2020-04-18 11:06:28 +02:00
Laurent Destailleur
5254a94038
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/ldap.php
htdocs/commande/class/commande.class.php
htdocs/commande/index.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/expedition/list.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/list.php
htdocs/loan/list.php
htdocs/product/class/product.class.php
htdocs/supplier_proposal/list.php
2020-04-16 15:58:59 +02:00
atm-quentin
f7c07640dd
viewstatut to search_status
2020-04-15 15:01:00 +02:00
Scrutinizer Auto-Fixer
387ea73bf3
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-13 11:24:42 +00:00
Laurent Destailleur
96d087c99d
Fix clean event report
2020-04-13 02:59:33 +02:00
Laurent Destailleur
596ba8d679
Clean deprecated code.
2020-04-13 01:10:35 +02:00
Laurent Destailleur
92b6b1a042
Look and feel v12
2020-04-12 18:13:43 +02:00
stickler-ci
a873afdad9
Fixing style errors.
2020-04-12 15:08:44 +00:00
Laurent Destailleur
51f73526f9
Merge branch 'develop' into patch-8
2020-04-12 17:07:57 +02:00
Laurent Destailleur
fe4cd2e7bc
Update actioncomm.class.php
2020-04-12 17:05:12 +02:00
Laurent Destailleur
422e33a68b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/ihm.php
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/stats/cabyprodserv.php
htdocs/filefunc.inc.php
htdocs/takepos/invoice.php
2020-04-12 17:01:44 +02:00
Laurent Destailleur
1cda760621
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
2020-04-12 16:54:09 +02:00
Laurent Destailleur
eebf48b27c
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
2020-04-12 16:52:58 +02:00
Frédéric FRANCE
e2660fd31c
Update actioncomm.class.php
2020-04-11 22:38:28 +02:00
Frédéric FRANCE
88f18ec3ce
can't remove actioncomm if there is a category
2020-04-11 22:24:50 +02:00
Laurent Destailleur
0845f0bcd3
Merge pull request #13523 from bb2a/patch-2
...
add in default search
2020-04-10 12:12:28 +02:00
Laurent Destailleur
5ff981bf61
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/user/perms.php
2020-04-10 12:04:21 +02:00
Laurent Destailleur
874cbcefc7
Fix permission to close a proposal or order was not correctly used
...
#13547
2020-04-10 11:54:14 +02:00
Scrutinizer Auto-Fixer
444c293c01
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Anthony Berton
a7440687ec
Update list.php
2020-04-10 10:38:31 +02:00
Laurent Destailleur
4ff503d20a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/list.php
htdocs/supplier_proposal/list.php
2020-04-10 02:07:51 +02:00
Laurent Destailleur
7fe8c7eab3
FIX #11855
2020-04-10 01:37:04 +02:00
Laurent Destailleur
83af4ebea4
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/product/stock/class/entrepot.class.php
htdocs/product/stock/list.php
2020-04-10 01:22:22 +02:00
Laurent Destailleur
63f0c07a07
Add warning
2020-04-08 18:32:13 +02:00
Laurent Destailleur
1adee36314
Upgrade to font awesome 5.13
2020-04-07 21:11:18 +02:00
Laurent Destailleur
ff1b3db54b
Fix regression on hamburger picto
2020-04-06 23:38:30 +02:00
Laurent Destailleur
28a1b7af35
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/modulebuilder/index.php
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-04-03 18:07:24 +02:00
Laurent Destailleur
193a10bc39
FIX cloning of emailing when no content selected
2020-04-03 02:29:10 +02:00
Laurent Destailleur
84cda962c1
Clean dead code
2020-04-02 12:03:29 +02:00
Laurent Destailleur
4207d94f53
FIX Bad position of total in column
...
Conflicts:
htdocs/fourn/facture/paiement.php
2020-03-27 19:10:01 +01:00
Laurent Destailleur
a4797634d5
FIX Bad position of total in column
2020-03-27 19:08:39 +01:00
Laurent Destailleur
c27592bad2
Clean deprecated params on all fetch_optionals()
2020-03-27 16:02:58 +01:00
Laurent Destailleur
004397304e
FIX Foreign currency lost when splitting a discount
2020-03-26 02:32:53 +01:00
Laurent Destailleur
f0de10897a
FIX Foreign currency lost when splitting a discount
2020-03-26 02:32:24 +01:00
Laurent Destailleur
fa3bba942f
Start to save the VAT src code into table of discounts to reuse them
...
later
2020-03-26 02:01:30 +01:00
Alexandre SPANGARO
c3e5cf901d
Work on split module fournisseur
2020-03-24 22:20:25 +01:00
Alexandre SPANGARO
e6d9f7885c
Work on split module fournisseur
2020-03-24 21:22:20 +01:00
Laurent Destailleur
62fefab5ac
Standardize color of status
2020-03-24 19:06:37 +01:00
Laurent Destailleur
a5379c7144
FIX All forms must use newToken()
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/cashcontrol/cashcontrol_card.php
htdocs/supplier_proposal/card.php
2020-03-24 13:14:23 +01:00
Laurent Destailleur
1ff15e1fd9
FIX All forms must use newToken()
2020-03-24 13:10:35 +01:00
Scrutinizer Auto-Fixer
e8083e2a65
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-23 14:54:02 +00:00
Laurent Destailleur
01e60562b9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/index.php
htdocs/takepos/takepos.php
2020-03-23 15:38:10 +01:00
Alexandre SPANGARO
d5729e6dcc
Work on split module fournisseur
2020-03-23 05:53:33 +01:00
Alexandre SPANGARO
e6a59dcdbb
Work on split module fournisseur
2020-03-23 05:43:41 +01:00
Alexandre SPANGARO
6e9a07d119
Work on split module fournisseur
2020-03-22 05:33:30 +01:00
Laurent Destailleur
599bf89f60
Fix can edit emailing after sending has started
2020-03-20 20:46:21 +01:00
Laurent Destailleur
5d9e713a1c
Fix better default sort order
2020-03-20 20:36:59 +01:00
Laurent Destailleur
68cadb58bb
Fix better default sort order
2020-03-20 20:36:26 +01:00
Laurent Destailleur
8bab245c7e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/tpl/contacts.tpl.php
2020-03-18 18:50:55 +01:00
Laurent Destailleur
8192e9dc67
FIX Missing token in form
2020-03-14 03:02:49 +01:00
Laurent Destailleur
6e71bb8707
Look and feel v12: Use color of status for dotnuts
2020-03-14 02:17:08 +01:00
Laurent Destailleur
3b72005f93
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cashdesk.lang
htdocs/langs/fr_FR/errors.lang
htdocs/langs/fr_FR/products.lang
htdocs/langs/fr_FR/projects.lang
2020-03-14 00:22:11 +01:00
florian HENRY
ca269864f7
let keep it to expedition
2020-03-13 14:55:34 +01:00
Laurent Destailleur
33c5db9cc3
Prepare code for the new pagination possibility
2020-03-13 13:07:11 +01:00
Laurent Destailleur
d380da3f4c
Merge pull request #13250 from FHenry/dev_fix_createLineWithCOrrectLink
...
NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other documents lines the id of original lines and origin class line rather than origin object id and origin object type
2020-03-12 12:57:04 +01:00
Laurent Destailleur
2994a5f35e
Merge pull request #13336 from Dolibarr/scrutinizer-patch-2
...
Scrutinizer Auto-Fixes
2020-03-12 12:47:52 +01:00
Laurent Destailleur
54b32d94e0
Fix field required
2020-03-12 12:47:08 +01:00
Scrutinizer Auto-Fixer
f413ce6aac
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-12 11:45:44 +00:00
florian HENRY
eaa9d22783
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_createLineWithCOrrectLink
2020-03-12 09:45:04 +01:00
florian HENRY
29b2ea77d5
NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other document s lines the id of origin lines and origin class line rather than origin object id and origin object type
2020-03-12 09:44:43 +01:00
florian HENRY
6edaa7ac11
fix getentity on comm/card.php
2020-03-11 18:00:35 +01:00
florian HENRY
f40c8ce507
fix getentity on comm/card.php
2020-03-11 17:58:41 +01:00
Laurent Destailleur
82f0d8a3bc
Fix bad params
2020-03-09 17:38:47 +01:00
Laurent Destailleur
3edc3dd382
Fix fields definition
2020-03-08 20:10:31 +01:00
Laurent Destailleur
343a80fd3d
Fix table fields
2020-03-08 19:25:00 +01:00
Laurent Destailleur
054ffb7547
Depreciate variables not used by Dolibarr.
2020-03-06 14:38:06 +01:00
Laurent Destailleur
d0f22c7bff
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/boxes/box_graph_product_distribution.php
2020-03-06 14:22:42 +01:00
Laurent Destailleur
d4b67a6cef
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/contrat/list.php
htdocs/core/lib/functions.lib.php
2020-03-06 14:19:30 +01:00
Laurent Destailleur
aaf9aef5c8
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/contrat/list.php
2020-03-06 14:17:21 +01:00
Laurent Destailleur
ad9d0a3472
Fix graph of product distribution when too much record
2020-03-06 12:45:02 +01:00
ATM-Nicolas
a9d7bbc2ed
FIX : Remove unexisting link
2020-03-06 09:52:19 +01:00
Laurent Destailleur
0bd2740779
NEW Can force position of legend of graph on right (instead of top)
2020-03-05 17:23:19 +01:00
Laurent Destailleur
fc31680bd0
Several fix for chart.js graphs
2020-03-05 02:55:06 +01:00
Laurent Destailleur
f35f0ecf9d
Look and feel v12
2020-03-05 01:54:12 +01:00
Laurent Destailleur
7d0d0aa75a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
2020-03-04 01:56:50 +01:00
Laurent Destailleur
0b37c2c201
FIX #13263
2020-03-04 00:53:07 +01:00
Laurent Destailleur
2b6aaa652d
Merge pull request #13256 from ATM-Marc/NEW_list_multicurrency
...
NEW: add multicurrency columns to document lists
2020-03-03 23:12:53 +01:00
Laurent Destailleur
7866f89585
Merge pull request #13260 from atm-quentin/FIX_ecm_files
...
FIX ecm_files didnt match cause document ref contained "/"
2020-03-03 23:09:02 +01:00
ptibogxiv
b6bad0c936
Update api_proposals.class.php
2020-03-03 13:40:26 +01:00
ptibogxiv
fa5aeebcd8
NEW get proposal by ref with API
2020-03-03 13:39:22 +01:00
atm-quentin
9446138951
FIX ecm_files didnt match cause document ref contained "/"
2020-03-03 12:07:18 +01:00
Laurent Destailleur
f0d458682d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-29 00:15:17 +01:00
Laurent Destailleur
87b3cf9765
FIX Bad link to template invoices
2020-02-28 12:01:43 +01:00
Marc de Lima Lucio
cdddccde16
NEW: propal list: enable multicurrency columns
2020-02-27 17:34:45 +01:00
Laurent Destailleur
096a568e83
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2020-02-23 23:42:23 +01:00
Laurent Destailleur
3075e40f8c
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/comm/remx.php
htdocs/core/boxes/box_contacts.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/security.lib.php
2020-02-23 23:37:46 +01:00
Laurent Destailleur
5919570b34
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-02-23 23:31:51 +01:00
Laurent Destailleur
11ff3f6562
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-02-23 23:31:03 +01:00
Laurent Destailleur
530930b7aa
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2020-02-23 23:30:38 +01:00
Maxime Kohlhaas
0ab16ed5ae
Fix #10179 discount split
2020-02-23 16:50:24 +01:00
Laurent Destailleur
44eda2d4ad
Fix doxygen
2020-02-20 13:42:43 +01:00
Laurent Destailleur
895503d2eb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/index.php
htdocs/core/class/CMailFile.class.php
2020-02-20 00:21:25 +01:00
Laurent Destailleur
2cfca2a45e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/comm/action/card.php
htdocs/comm/index.php
htdocs/core/boxes/box_fournisseurs.php
htdocs/core/boxes/box_propales.php
htdocs/societe/index.php
2020-02-20 00:18:58 +01:00
Laurent Destailleur
394c256ca1
Merge pull request #13129 from mapiolca/patch-33
...
Fix issue with unselect data
2020-02-19 11:37:52 +01:00
Scrutinizer Auto-Fixer
fd48877dc6
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-18 22:47:25 +00:00
Laurent Destailleur
2ac064059a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/projet/element.php
2020-02-18 22:40:43 +01:00
root
0dcb83e6bf
referer XSS patches
2020-02-18 22:31:24 +01:00
Laurent Destailleur
2069438115
Merge pull request #13125 from 418sec/develop
...
dolibarr - Cross-site Scripting (XSS) - Fix:
2020-02-18 22:29:53 +01:00
Laurent Destailleur
9ce0e6869e
Fix trans
2020-02-18 11:55:39 +01:00
VESSILLER
d1e9f3a505
FIX keep assigned users in session when loading projects and tasks
2020-02-18 11:18:00 +01:00
Pierre Ardoin
dbb7db376b
fix error code
2020-02-18 09:16:12 +01:00
Pierre Ardoin
49dd8e30aa
Fix not display data
2020-02-18 08:28:39 +01:00
Laurent Destailleur
be7bed7063
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-17 14:00:05 +01:00
Laurent Destailleur
e59ac41182
Fix phpcs
2020-02-17 13:59:44 +01:00
Laurent Destailleur
a6b0fec90b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/exports/class/export.class.php
2020-02-17 12:35:34 +01:00
Laurent Destailleur
504a67daee
FIX duplicate class name into some log lines
2020-02-17 12:34:00 +01:00
Jamie Slome
2d9162aedb
Merge branch 'develop' into develop
2020-02-17 10:49:41 +00:00
Laurent Destailleur
35ada37d4d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal/list.php
htdocs/filefunc.inc.php
2020-02-14 19:14:26 +01:00
Laurent Destailleur
bb895cb1d8
FIX ref_client not visible in tooltip.
2020-02-13 18:00:59 +01:00
Scrutinizer Auto-Fixer
011803ac71
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-13 11:36:05 +00:00
Scrutinizer Auto-Fixer
17010478ba
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-13 09:44:08 +00:00
Laurent Destailleur
33b7fc11f0
Fix status of emailing target
2020-02-13 10:41:53 +01:00
Laurent Destailleur
495b3d54f1
Fix status of emailing target
2020-02-13 10:41:31 +01:00
Laurent Destailleur
74d3912763
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
2020-02-11 16:52:58 +01:00
Laurent Destailleur
644b27bcf9
Fix look and feel v11
2020-02-10 13:34:09 +01:00
Laurent Destailleur
b9a8d82b2f
FIX Filter on list of events were lost after "Back to list"
2020-02-10 13:29:26 +01:00
Laurent Destailleur
f70dd8ec06
Clean code. Load thirdparty for correct lang before generating doc
2020-02-10 00:22:53 +01:00
Laurent Destailleur
8645fd8946
FIX CVE-2019–17223 FIX #13053
2020-02-09 18:28:57 +01:00
Laurent Destailleur
5fccbcc469
Merge pull request #13054 from hregis/10.0_mc
...
FIX missing hook parameter
2020-02-08 16:08:13 +01:00
Laurent Destailleur
716f765ce1
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
2020-02-08 16:00:06 +01:00
Laurent Destailleur
df7cdd1da8
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/tools/export_files.php
htdocs/comm/mailing/class/advtargetemailing.class.php
htdocs/core/tpl/advtarget.tpl.php
2020-02-08 15:42:35 +01:00
Laurent Destailleur
4e4fd4c76c
Remove code using a no more used field
2020-02-07 13:15:51 +01:00
Regis Houssin
a915a4faaf
FIX missing hook parameter
2020-02-07 11:14:13 +01:00
Laurent Destailleur
fe0d1a81eb
Fix filter on current user is stupi on the view "per user".
2020-02-06 21:16:48 +01:00
atm-arnaud
bd6d49f04a
FIX advanced target emailing sql and ergonomy
2020-02-06 12:08:50 +01:00
Laurent Destailleur
f3597926c4
Fix missing escape returned by ci
2020-02-06 10:05:13 +01:00
oscim
7cc87423e4
ref_ext is not in sql requete for save
...
ref_ext is not in sql requete for save
2020-02-05 22:31:27 +01:00
Laurent Destailleur
1344ce06a5
Merge pull request #12317 from OPEN-DSI/new-propal-tooltip-note
...
NEW add public and private notes in propal list
2020-02-05 21:41:17 +01:00
Laurent Destailleur
66590cca10
Update list.php
2020-02-05 21:40:49 +01:00
root
2419f122c4
referer XSS patches
2020-02-03 23:10:04 +00:00
Alexandre SPANGARO
d6d3fff9dc
Merge branch 'develop' into 10.0_intracommreport
2020-02-03 21:15:07 +01:00
Laurent Destailleur
4765198af2
Clean code from using deprecated field amount
2020-02-02 19:03:37 +01:00
Scrutinizer Auto-Fixer
5fda829023
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-30 00:48:28 +00:00
Laurent Destailleur
25f0e893ba
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-29 23:49:43 +01:00
Laurent Destailleur
1144b937eb
Fix phpcs
2020-01-29 23:34:54 +01:00
Laurent Destailleur
7b10c2440b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-29 23:08:42 +01:00
kadogo
b2610903a4
NEW enable put for agendaevents api
2020-01-29 22:55:44 +01:00
Laurent Destailleur
80707d6a5e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-28 17:24:26 +01:00
Laurent Destailleur
3a9e238dc6
FIX Missing value of $formconfirm as parameters of hook
2020-01-28 12:00:27 +01:00
Laurent Destailleur
51d750cb49
Merge pull request #12865 from TobiasSekan/ExportIcalWithHolidays
...
New: Export ical with holidays
2020-01-28 03:19:34 +01:00
Tobias Sekan
ce9d1a320f
Update actioncomm.class.php after review
2020-01-27 08:27:13 +01:00
Laurent Destailleur
df478dc170
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-27 01:53:49 +01:00
Laurent Destailleur
ae087d665c
Merge pull request #12916 from RubenRuCh/11.0
...
Fix: strict mode mysql compatibility
2020-01-26 22:24:25 +01:00
Laurent Destailleur
0f2141269a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-01-25 14:43:57 +01:00
Laurent Destailleur
09f809f347
FIX #12913
2020-01-25 14:03:24 +01:00
Laurent Destailleur
27a0858050
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
2020-01-23 17:41:31 +01:00
AdrianDominik
d302f190a7
Fix: strict mode mysql compatibility
2020-01-23 13:29:28 +01:00
Laurent Destailleur
25665daa40
FIX #11957
2020-01-22 14:53:40 +01:00
Laurent Destailleur
59dfbc49a7
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-22 14:42:18 +01:00
Laurent Destailleur
bfc8369418
Fix phpcs
2020-01-22 14:15:08 +01:00
Laurent Destailleur
f06f15de2e
Merge pull request #12861 from TobiasSekan/ShowHolidaysInAgenda
...
New: Show holidays in the agenda view (month, week, day)
2020-01-22 14:13:55 +01:00
Laurent Destailleur
d3411a79ef
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-22 14:11:44 +01:00
Laurent Destailleur
d87419f3db
FIX #11957
2020-01-22 13:34:07 +01:00
Laurent Destailleur
2d07a08e55
Fix init of specimen
2020-01-21 00:22:57 +01:00
Laurent Destailleur
80483fc085
Fix init of specimen
2020-01-21 00:20:03 +01:00
Laurent Destailleur
6fd717539d
Merge pull request #12887 from Dolibarr/scrutinizer-patch-5
...
Scrutinizer Auto-Fixes
2020-01-18 20:21:29 +01:00
Laurent Destailleur
24d439845b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
2020-01-18 20:20:25 +01:00
Scrutinizer Auto-Fixer
8744f6ab7b
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-18 15:17:07 +00:00
Laurent Destailleur
81f8a486c9
Look and feel v11
2020-01-17 14:56:06 +01:00
stickler-ci
b47e2e8127
Fixing style errors.
2020-01-16 12:55:08 +00:00
Tobias Sekan
651bf8c1fc
Export ical with holidays
2020-01-16 13:49:05 +01:00
VESSILLER
48297759fb
Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-tooltip-note
2020-01-16 10:53:57 +01:00
stickler-ci
eca59220d8
Fixing style errors.
2020-01-16 09:44:49 +00:00
Tobias Sekan
72e227a543
Add link to leave request for holidays in agenda
2020-01-16 10:37:16 +01:00
Tobias Sekan
bbd7900fc7
Show holidays in agenda
2020-01-16 10:34:45 +01:00
Laurent Destailleur
2b7e45cb09
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-15 20:13:54 +01:00
Laurent Destailleur
2c40e4be94
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-15 20:13:45 +01:00
Laurent Destailleur
98eda68afb
Fix linkg to public notes
2020-01-15 19:49:45 +01:00
Laurent Destailleur
132bb67d14
Merge pull request #12364 from aspangaro/11.0_a1
...
NEW Propal list - Add date start & date end
2020-01-15 17:52:55 +01:00
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category
2020-01-15 14:21:06 +01:00
Laurent Destailleur
b47db086cb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/inventory/class/inventory.class.php
htdocs/product/inventory/list.php
2020-01-10 14:30:42 +01:00
Laurent Destailleur
d97a59ac4a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
ChangeLog
htdocs/comm/remise.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/variants/combinations.php
2020-01-10 14:25:26 +01:00
Laurent Destailleur
97f62c68f2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-08 13:38:03 +01:00
Laurent Destailleur
622dc7e8d7
Debug v11
2020-01-07 22:01:55 +01:00
Laurent Destailleur
7ef3ee56bd
Fix MRP
2020-01-07 20:28:21 +01:00
ptibogxiv
e820af4aa0
FIX: multicompany for discount
2020-01-07 13:07:36 +01:00
Laurent Destailleur
6dcba0f053
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-04 14:27:55 +01:00
Laurent Destailleur
38de69f5a9
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/dict.php
htdocs/comm/action/list.php
htdocs/compta/bank/releve.php
htdocs/compta/salaries/card.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/boxes.lang
htdocs/langs/en_US/main.lang
htdocs/product/class/product.class.php
htdocs/product/reassort.php
htdocs/product/stock/product.php
htdocs/projet/element.php
2020-01-04 14:20:25 +01:00
Laurent Destailleur
afd32135f2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/takepos/invoice.php
2020-01-01 22:37:13 +01:00
Laurent Destailleur
e4a03e98b7
FIX Do not record resource owner of event when not defined.
...
More log to track payment errors.
2020-01-01 12:47:01 +01:00
Laurent Destailleur
d2efe1d427
Fix SQL injection on type parameter in list of events
2019-12-31 17:52:28 +01:00
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-31 13:57:40 +01:00
Alexandre SPANGARO
c664a1e42d
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2019-12-31 08:34:37 +01:00
Laurent Destailleur
945296bb55
Merge pull request #12690 from atm-greg/Hook_on_ics_generation
...
NEW hook on ics generation to add more events in eventarray
2019-12-30 22:03:07 +01:00
VESSILLER
046aba8abd
FIX indented errors
2019-12-26 10:14:05 +01:00
lvessiller-opendsi
dec64b45e8
Merge branch 'develop' into new-propal-tooltip-note
2019-12-26 10:06:38 +01:00
VESSILLER
bf1bf10a53
FIX resolve conflicts
2019-12-26 09:56:35 +01:00
VESSILLER
23b4e3ad6d
FIX resolve conflicts
2019-12-26 09:50:15 +01:00
Alexandre SPANGARO
af4b0f54c5
Merge remote-tracking branch 'upstream/develop' into 11.0_a1
2019-12-23 20:44:32 +01:00
Laurent Destailleur
dcf07646cc
Fix specimen
2019-12-21 14:02:06 +01:00
Laurent Destailleur
19c14f354e
Fix specimen
2019-12-21 14:01:40 +01:00
Laurent Destailleur
f44b85f557
Fix $_SESSION['newtoken'] must be newToken()
2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
455178ff73
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-18 14:20:36 +00:00
Scrutinizer Auto-Fixer
c8baaa2995
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-16 12:06:25 +00:00
Laurent Destailleur
838633d0de
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/api/class/api_setup.class.php
htdocs/compta/facture/card.php
htdocs/compta/stats/index.php
htdocs/core/actions_massactions.inc.php
htdocs/install/upgrade2.php
htdocs/loan/card.php
htdocs/loan/document.php
htdocs/loan/info.php
htdocs/loan/note.php
htdocs/loan/schedule.php
htdocs/product/list.php
htdocs/ticket/card.php
htdocs/user/class/user.class.php
2019-12-14 14:53:49 +01:00
Laurent Destailleur
d17c177251
Merge pull request #12684 from frederic34/hookagendaperuser
...
add hook like for per day/week/month
2019-12-14 13:52:51 +01:00
Laurent Destailleur
835d22f556
Merge branch 'develop' into doxygen_todo
2019-12-14 13:46:40 +01:00
Laurent Destailleur
6a03015fa4
Fix warning
2019-12-13 16:29:58 +01:00
Laurent Destailleur
d38c73c90a
FIX output of emails from and error on emailing pages.
2019-12-13 15:52:08 +01:00
Frédéric FRANCE
57055bad03
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-13 14:36:00 +01:00
Laurent Destailleur
ce47de453e
Fix HTML5
2019-12-12 10:31:08 +01:00
Frédéric FRANCE
307bad1d2a
doxygen todo
2019-12-11 19:11:13 +01:00
atm-greg
caaa95da6a
hook on ics generation to add more events in eventarray
2019-12-11 15:33:36 +01:00
Frédéric FRANCE
5c59ddb357
add hook like for per day/week/month
2019-12-10 21:11:52 +01:00
Laurent Destailleur
f98713efdd
Update propal.class.php
2019-12-10 19:20:23 +01:00
Laurent Destailleur
452976850f
Update propal.class.php
2019-12-10 19:18:45 +01:00
David
4c463cdbb5
FIX: propal update
...
Update fields 'date' and 'fin_validite'
2019-12-10 16:16:33 +01:00
Scrutinizer Auto-Fixer
54ca37dc65
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-09 09:35:58 +00:00
Laurent Destailleur
4d489f64b0
Fix getpost
2019-12-06 17:42:09 +01:00
Laurent Destailleur
796f34628d
Debug v11
2019-12-06 17:40:22 +01:00
Laurent Destailleur
a4272ab947
Debug v11
2019-12-06 09:20:45 +01:00
Laurent Destailleur
93d66d8213
Debug v11
2019-12-06 08:50:26 +01:00
Frédéric FRANCE
d9bfa62367
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-05 21:47:42 +01:00
Florian Mortgat
3f6715a377
FIX: add URL param "restore_last_search_values=1" to all backlinks that point to a list
2019-12-05 15:34:41 +01:00
Frédéric FRANCE
4c5c6b6ff1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-03 17:56:43 +01:00
Laurent Destailleur
7a1a932755
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/list.php
htdocs/main.inc.php
2019-12-03 15:03:10 +01:00
Laurent Destailleur
d153918a10
Fix trans
2019-12-03 15:00:52 +01:00
Laurent Destailleur
41a176ce72
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/remx.php
htdocs/core/modules/modStripe.class.php
htdocs/product/stock/replenish.php
htdocs/stripe/payout.php
2019-12-03 13:58:15 +01:00
Laurent Destailleur
eb5a2bd1a5
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/expensereport/card.php
htdocs/user/card.php
2019-12-03 13:52:42 +01:00
Laurent Destailleur
072db96b11
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-12-03 13:48:38 +01:00
Scrutinizer Auto-Fixer
36a74cd160
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-03 10:17:29 +00:00
Laurent Destailleur
6f7343b14f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-02 11:01:26 +01:00
Laurent Destailleur
6d81bc77cb
Fix look and feel v11
2019-12-02 11:00:09 +01:00
Laurent Destailleur
92070fa491
Fix name of variable $trigger_name into $triggersendname
2019-12-02 09:38:16 +01:00
Frédéric FRANCE
25ed2b930f
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-01 16:10:37 +01:00
Maxime Kohlhaas
a220d43bd6
Fix #11849 : missing price2num in discount split
2019-12-01 01:41:13 +01:00
Laurent Destailleur
a2a96f8796
# WARNING: head commit changed in the meantime
...
Restore file for travis
2019-12-01 00:41:11 +01:00
Frédéric FRANCE
35394639a4
The property ownerid does not exist on ActionComm
2019-11-28 22:26:25 +01:00
Scrutinizer Auto-Fixer
5f99e25c45
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-28 11:36:20 +00:00
Frédéric FRANCE
b2912e688b
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-27 22:54:05 +01:00
Frédéric FRANCE
4c4ae5b6e1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-26 08:10:40 +01:00
Frédéric FRANCE
3edac06fae
Form selectAvailabilityDelay returns void
2019-11-26 00:06:57 +01:00
Laurent Destailleur
e4d9f99484
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/remx.php
htdocs/expedition/card.php
htdocs/fourn/facture/card.php
2019-11-22 15:04:40 +01:00
Laurent Destailleur
9eb98ca94c
Merge pull request #12478 from ptibogxiv/patch-281
...
FIX display job of contact list
2019-11-22 14:26:12 +01:00
Laurent Destailleur
d487f6b84d
Clean code
2019-11-22 14:10:12 +01:00
Laurent Destailleur
3daeb24da1
Fix confusion with field name in sql
2019-11-21 13:05:13 +01:00
ptibogxiv
f73bd0e0a6
FIX display job of contact list
...
can see différent contact with same name but different job
2019-11-20 13:07:26 +01:00
Laurent Destailleur
d7e8c71091
Look and feel v11
2019-11-20 12:45:15 +01:00
Frédéric FRANCE
d182eee4bf
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-19 23:26:00 +01:00
Laurent Destailleur
fb70893229
Fix missing class reposition
2019-11-19 21:29:49 +01:00
Frédéric FRANCE
2e5f539b2a
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-18 17:45:52 +01:00
Alexandre SPANGARO
b3e09e050c
fix missing param
2019-11-18 11:36:12 +01:00
Alexandre SPANGARO
b11579c1bd
Merge remote-tracking branch 'upstream/develop' into 11.0_a1
2019-11-18 09:26:40 +01:00
Laurent Destailleur
2689f7515c
Fix pb with colspan and extrafields.
...
Fix remove empty id
2019-11-16 14:38:05 +01:00
Frédéric FRANCE
6784ea9fae
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-16 09:21:57 +01:00
Laurent Destailleur
4fc7b8c3b1
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/extrafields_list_search_title.tpl.php
2019-11-14 12:49:42 +01:00
Laurent Destailleur
a29adc94f3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/comm/card.php
htdocs/langs/en_US/admin.lang
2019-11-14 12:48:33 +01:00
Laurent Destailleur
9d963a7ca6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-11-14 12:44:32 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:15 +00:00
Laurent Destailleur
f5da126cff
Fix property not defined
2019-11-14 12:01:01 +01:00
Frédéric FRANCE
a3e092b227
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-14 09:21:26 +01:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
...
Scrutinizer Auto-Fixes
2019-11-14 08:50:24 +01:00
Laurent Destailleur
86094613e8
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
...
Scrutinizer Auto-Fixes
2019-11-14 08:50:06 +01:00
Frédéric FRANCE
446c66da62
use class CONST
2019-11-14 08:15:39 +01:00
Frédéric FRANCE
3bac051521
use class CONST
2019-11-14 08:07:16 +01:00
Frédéric FRANCE
9040f6d9c7
can tag actioncomm
2019-11-13 21:18:34 +01:00
Frédéric FRANCE
3ec7568559
FIX #12385
2019-11-13 20:44:21 +01:00
Scrutinizer Auto-Fixer
b40ecc3933
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:39 +00: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
Laurent Destailleur
3430a88c72
Fix $conf not defined
2019-11-12 10:13:22 +01:00
Laurent Destailleur
c02cd80b75
Clean code
2019-11-12 10:11:30 +01:00
Scrutinizer Auto-Fixer
c85e54b08c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-12 08:46:08 +00:00
Frédéric FRANCE
2148d6ed05
css
2019-11-11 20:33:34 +01:00
stickler-ci
bb74d2f8bd
Fixing style errors.
2019-11-10 10:00:07 +00:00
Philippe GRAND
6e0c028d51
add some comment
2019-11-10 10:59:44 +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
cb1e5954f6
Fix regression
2019-11-08 13:10:41 +01:00
Laurent Destailleur
cb3fd5728b
Fix color for not busy events
2019-11-08 13:04:49 +01:00
Laurent Destailleur
dc84d7e844
Code comment
2019-11-08 11:29:56 +01:00
Laurent Destailleur
34564ea084
Merge pull request #12381 from TobiasSekan/FixIcalExportAlwaysSameUser
...
Fix ICAL export add a user to all events
2019-11-08 11:26:57 +01:00
Tobias Sekan
3677855ebc
Fix ICAL export add a user to all events
2019-11-07 15:45:34 +01:00
Laurent Destailleur
26e95c9161
Merge pull request #12359 from TobiasSekan/FixMixedEventsWithSameTime
...
Fix mixed order of events with same time
2019-11-07 11:43:39 +01:00
Alexandre SPANGARO
938d997e51
NEW Propal list - Add date start & date end
2019-11-07 06:33:33 +01:00
VESSILLER
bcafef42b0
NEW tooltip notes with first public note and then private note
2019-11-06 16:45:52 +01:00
Tobias Sekan
6fdbe8923f
Fix mixed order of events with same time
2019-11-06 10:33:26 +01: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
VESSILLER
fefb4a7f95
FIX replace <br /> by <br>
2019-11-05 15:13:44 +01:00
Laurent Destailleur
ce1dec253f
FIX #11364
2019-11-05 12:47:38 +01:00
Laurent Destailleur
4ca85eacc1
Debug module BOM
2019-11-04 15:45:50 +01:00
Laurent Destailleur
11500fb8d9
FIX confusion between permto... and permisstionto...
2019-11-04 15:33:49 +01:00
VESSILLER
668bb0cb86
NEW add public and private notes in propal list
2019-11-04 11:03:39 +01:00
Laurent Destailleur
4909a21f8a
Fix css
2019-11-03 22:09:20 +01:00
Laurent Destailleur
630a150b09
Fix multicurrency rate must be visible if currency differs only
2019-11-03 17:48:16 +01:00
Laurent Destailleur
9c5e17d676
Merge pull request #12214 from homer8173/patch-8
...
Implement new now feature
2019-11-02 15:09:06 +01:00
Laurent Destailleur
93f3b1d2db
Clean APIs
2019-11-02 15:05:14 +01:00
Laurent Destailleur
df750b6a9d
Merge pull request #12287 from TobiasSekan/AddAttendeeToIcal
...
NEW Add attendee to ical export + cleanup
2019-11-02 13:40:27 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid
...
replace deprecated user->societe_id by user->socid
2019-11-02 13:34:21 +01:00
Laurent Destailleur
137cfe9d4c
Merge pull request #12276 from frederic34/patch-11
...
css
2019-11-02 13:31:34 +01:00
Laurent Destailleur
07e9e2e872
Merge pull request #12274 from frederic34/patch-7
...
css
2019-11-02 13:31:10 +01:00
Laurent Destailleur
d232b7a387
Merge pull request #12286 from grandoc/new_branch_01_11_2019
...
add some comment
2019-11-02 13:00:23 +01:00
Laurent Destailleur
58ffb73627
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-02 12:59:49 +01:00
Laurent Destailleur
45c77b4560
Renaming some libelle into label
2019-11-02 12:59:38 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid
2019-11-02 12:01:06 +01:00
Laurent Destailleur
c12e66e2a2
Merge branch 'develop' into new_branch_01_11_2019
2019-11-02 12:00:04 +01:00
Laurent Destailleur
1797b49778
Merge pull request #12288 from frederic34/patch-14
...
form_select_status_action returns void
2019-11-02 11:48:07 +01:00
Laurent Destailleur
3943cb18c2
Merge pull request #12295 from frederic34/actioncomm_doxygen
...
doxygen for actioncomm class
2019-11-02 11:37:30 +01:00
Laurent Destailleur
4fd20157c2
Merge pull request #12298 from frederic34/patch-22
...
Update propal.class.php
2019-11-02 10:08:33 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid
2019-11-02 09:14:15 +01:00
Laurent Destailleur
941043dd67
Fix navigation on resources
2019-11-02 00:17:08 +01:00
Laurent Destailleur
cea2c3a9f4
Look and feel v11
2019-11-01 23:58:14 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid
2019-11-01 21:39:20 +01:00
Frédéric FRANCE
693506cebd
Update propal.class.php
...
socid is int
2019-11-01 20:26:55 +01:00
Frédéric FRANCE
bb9b435875
doxygen for actioncomm class
2019-11-01 17:12:07 +01:00
Frédéric FRANCE
400defd93d
form_select_status_action returns void
2019-11-01 15:04:37 +01:00
Laurent Destailleur
e3b5be7475
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
...
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
2019-11-01 12:52:03 +01:00
Sekan, Tobias
0bfff92032
Add attendee to ical export + cleanup
2019-11-01 11:59:54 +01:00
Philippe Grand
4b5ca5c25e
Update mailing.class.php
2019-11-01 11:15:53 +01:00
stickler-ci
0c6938aa2a
Fixing style errors.
2019-11-01 09:44:29 +00:00
Philippe GRAND
c851a9faff
add some comment
2019-11-01 10:38:58 +01:00
Laurent Destailleur
c215d534fc
Fix phpcs
2019-10-31 21:16:41 +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
a59c3ab0be
Update index.php
2019-10-30 18:55:04 +01:00
Frédéric FRANCE
ade50b5362
css
2019-10-30 18:50:55 +01:00
Laurent Destailleur
66a288a343
Merge pull request #12235 from frederic34/scopeindent
...
clean indent
2019-10-30 02:57:59 +01:00
Laurent Destailleur
6073692654
Merge pull request #12243 from TobiasSekan/FixEventSortNonNumeric
...
Fix non-numeric error in sort event function
2019-10-30 02:57:00 +01:00
Laurent Destailleur
c952c7e3c2
Merge pull request #12237 from grandoc/new_branch_26_10_2019
...
Internationalization
2019-10-30 02:53:34 +01:00
iouston
2072768ec2
NEW : add name_alias in fields to search all
2019-10-29 11:20:10 +01:00
Tobias Sekan
bfe7ad211f
Fix non-numeric error in sort event function
...
Fix non-numeric error in sort event function and fix mixed space and tab indent, use spaces
2019-10-28 09:53:27 +01:00
Philippe GRAND
c07dc1cd5f
Internationalization
2019-10-26 22:40:10 +02:00
Frédéric FRANCE
c44425d0a0
start clean indent in compta directory
2019-10-26 14:51:57 +02:00
Frédéric FRANCE
1a10b30a76
clean indent in comm directory
2019-10-26 14:28:40 +02:00
Norbert Penel
a67b3d8cf5
Implement new now feature
...
8d75e83e55
2019-10-24 18:55:43 +02:00
Laurent Destailleur
2201b11fd3
NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_SALE_PROPOSAL
...
NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_PROPOSAL
2019-10-24 13:41:04 +02:00
Laurent Destailleur
da00591bba
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/product.lib.php
htdocs/expedition/card.php
htdocs/product/list.php
2019-10-23 04:04:32 +02:00
Laurent Destailleur
161f2a018f
Fix responsive and bad closing td
2019-10-23 03:50:48 +02:00
Laurent Destailleur
b88968520b
Move code of extrafields to the new architecture
2019-10-22 17:08:37 +02:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces
2019-10-20 17:17:22 +02:00
Laurent Destailleur
b813dfe3c9
Merge pull request #12172 from TobiasSekan/FixMissingIcalAuthor
...
Fix missing organizer and contact on ical export
2019-10-20 13:49:47 +02:00
Laurent Destailleur
89b0730483
Update actioncomm.class.php
2019-10-20 13:49:36 +02:00
Tobias Sekan
28dea51c4a
Fix missing organizer in ical export
2019-10-18 13:18:09 +02:00
Laurent Destailleur
f85899742b
Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
...
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-17 17:48:42 +02:00
Laurent Destailleur
1a021e85f6
Merge pull request #12141 from TobiasSekan/FixNoneNumericValue
...
Fix non-numeric value encountered on ical export
2019-10-17 17:39:25 +02:00
Tobias Sekan
daa7f54295
fix - not removed old code line
2019-10-17 08:10:21 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-16 20:00:01 +02:00
Laurent Destailleur
8152c60878
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
2019-10-16 17:13:14 +02:00
Laurent Destailleur
f88733f46a
Html code simplest
2019-10-16 14:14:32 +02:00
Tobias Sekan
741627897e
fix interchanged allocation
2019-10-16 13:56:11 +02:00
Laurent Destailleur
a57b456aa6
Merge pull request #12143 from frederic34/patch-19
...
NEW Add location into event tooltip. Use full day for fullday events
2019-10-16 13:21:55 +02:00
Laurent Destailleur
e07e01580d
Replace deprecated code with new one
2019-10-16 03:34:32 +02:00
Frédéric FRANCE
ccd9da99f4
Update list.php
2019-10-15 20:11:15 +02:00
Frédéric FRANCE
6a8e8907ef
Update list.php
2019-10-15 17:55:07 +02:00
Tobias Sekan
199fb3be0f
Fix non-numeric value encountered on ical export
2019-10-15 14:29:27 +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
65b6bc26ba
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/facture/list.php
2019-10-14 23:54:24 +02:00
Laurent Destailleur
0fe3159a8a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/fourn/facture/list.php
2019-10-14 23:52:46 +02:00
Laurent Destailleur
0d4866c38c
Merge pull request #12118 from iouston/patch-3
...
NEW: Add 2 hidden options to set the default sorting (sort and order) on document page
2019-10-14 21:23:59 +02:00
Laurent Destailleur
176436ec34
Update document.php
2019-10-14 21:23:52 +02:00
Laurent Destailleur
5d02763288
Merge pull request #12129 from cyrilus/develop
...
ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning
2019-10-14 20:39:08 +02:00
stickler-ci
4b7987374b
Fixing style errors.
2019-10-14 14:46:04 +00:00
iouston
0a9cc96564
Update document.php
...
Add 2 hidden options for set by default a sort (sort and order) on document page
2019-10-14 15:01:57 +02:00
Laurent Destailleur
9efc5a1b9d
Fix extension
2019-10-13 15:00:07 +02:00
Laurent Destailleur
33f6206031
NEW Add link to export target of emailings into a CSV file.
2019-10-12 20:12:24 +02:00
Laurent Destailleur
9c94ffeea9
Fix css
2019-10-12 18:40:41 +02:00
Laurent Destailleur
9ba992b8b6
Work on inventory module
2019-10-12 12:31:35 +02:00
Frédéric FRANCE
849eda2023
Update index.php
2019-10-12 00:05:26 +02:00
Frédéric FRANCE
c3e8aec07c
fix translation for showemailing
...
in lang files, it's ShowEMailing not ShowEmailing
2019-10-11 23:54:05 +02:00
Laurent Destailleur
f345b5fdb0
Fix look and feel v10
2019-10-11 19:32:45 +02:00
Laurent Destailleur
a8676e63c8
CSS
2019-10-10 16:46:50 +02:00
ro@t.com
2149b155d1
ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning
2019-10-10 15:57:26 +02:00
Laurent Destailleur
b6c600c171
css
2019-10-10 11:44:03 +02:00
Laurent Destailleur
51ef2cd20a
FIX #12058
2019-10-07 20:20:06 +02:00
Laurent Destailleur
07d1a3fe8b
css
2019-10-07 18:17:22 +02:00
Laurent Destailleur
c83f40fc7e
Debug contact by default
2019-10-07 15:42:37 +02:00
Laurent Destailleur
f56da782ab
Merge pull request #12038 from Ahuahuachi/develop
...
NEW Add hidden options to send by email even for draft status
2019-10-07 14:18:53 +02:00
Laurent Destailleur
d4f4f33122
Merge pull request #12048 from frederic34/patch-17
...
Update card.php
2019-10-07 10:23:51 +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
bfd8bc839e
Update card.php
2019-10-06 10:28:09 +02:00
Alfredo Altamirano
140784d741
Merge remote-tracking branch 'Dolibarr/develop' into develop
2019-10-03 20:32:26 -05:00
Alfredo Altamirano
b6882af1b6
Add hidden options to send by email for all status
2019-10-03 20:21:13 -05:00
Laurent Destailleur
b60ee4c18c
css
2019-10-03 09:58:49 +02:00
Laurent Destailleur
24570f7165
Look and feel v11. Picto are fontawesome.
2019-10-02 18:14:41 +02:00
Laurent Destailleur
320e9bbeec
Text on tooltip can also be clickable
2019-10-02 15:54:42 +02:00
Laurent Destailleur
c6d38227b6
NEW Use a dedicated css for the pencil to edit a field
2019-10-02 14:44:38 +02:00
Laurent Destailleur
8ad81a092a
Clean code
2019-10-01 16:19:54 +02:00
Alexandre SPANGARO
16c6c9ae75
Merge remote-tracking branch 'upstream/develop' into 11.0_https
2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd
Merge branch 'develop' into 11.0_https
2019-10-01 06:11:43 +02:00
Frédéric FRANCE
fec67aade4
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-30 18:44:34 +02:00
Laurent Destailleur
d3eafa86d7
Merge pull request #11988 from frederic34/patch-12
...
Add hook beforeAgenda in comm/action/index.php
2019-09-30 18:03:25 +02:00
Laurent Destailleur
ce7e8c83a3
Use a dedicated css imgforviewmode for button used to switch view
2019-09-30 17:08:57 +02:00
Frédéric FRANCE
4a305ec95c
Add hook beforeAgenda in comm/action/index.php
2019-09-30 15:59:05 +02:00
Laurent Destailleur
d8de78dca9
Merge pull request #11984 from fuhraih/develop
...
Fix 11554 and 7533
2019-09-30 15:31:41 +02:00
Laurent Destailleur
b28cd1bb57
Merge pull request #11972 from aspangaro/11.0_fa_icon
...
NEW Add fa_icon on load_fiche_titre
2019-09-30 15:26:28 +02:00
Alexandre SPANGARO
aec50d3ac9
NEW Add fa_icon on load_fiche_titre
2019-09-30 10:14:55 +02:00
Frédéric FRANCE
258424416e
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-30 07:49:52 +02:00
Laurent Destailleur
a2140412e0
Fix title
2019-09-30 00:41:38 +02:00
Laurent Destailleur
2b57d486dc
NEW Upgrade ACE editor to v1.4.6
2019-09-28 13:50:32 +02:00
Laurent Destailleur
86e5465197
Standardize extrafields code
2019-09-28 10:55:09 +02:00
Alexandre SPANGARO
288aea190b
Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon
2019-09-28 06:09:40 +02:00
Alexandre SPANGARO
7f93f046e9
NEW Add fa_icon on load_fiche_titre
2019-09-28 06:02:25 +02:00
fuhraih
5757159c30
FIX #7533 Infinite loop in Agenda per user view if workinghours not set
...
correctly
Remove the spaces in the Working_hours and Working_days stored
2019-09-27 22:29:12 +02:00
Laurent Destailleur
c5e7413ed2
Merge branch 'develop' into fix-resource-event-move-check-busy
2019-09-27 15:35:14 +02:00
Laurent Destailleur
34813a931f
Merge branch 'develop' into patch-10
2019-09-27 14:45:09 +02:00
Laurent Destailleur
f90bfb54d4
Merge pull request #11913 from frederic34/actioncommcarddoaction
...
add doaction to actioncommcard
2019-09-27 14:34:49 +02:00
Laurent Destailleur
138b494b98
Merge pull request #11936 from aspangaro/11.0_translation
...
Translate and some fix
2019-09-27 12:15:50 +02:00
Frédéric FRANCE
41cb628d05
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-25 08:06:44 +02:00
Laurent Destailleur
961f2b5165
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/viewcat.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/takepos/invoice.php
2019-09-24 14:25:02 +02:00
Laurent Destailleur
5838fa1229
Fix az09 -> aZ09
2019-09-24 14:20:45 +02:00
Laurent Destailleur
db334a3b94
FIX Var not enough sanitized
2019-09-24 14:16:24 +02:00
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
1c13a38ce9
Typo abscissa
2019-09-23 21:45:23 +02:00
Laurent Destailleur
40f75b16d8
FIX Substitution of __PROJECT_XXX__ not done
2019-09-23 13:04:22 +02:00
VESSILLER
ea5ff59076
FIX check if a resource is in use after a drag and drop from events
2019-09-17 16:43:36 +02:00
Frédéric FRANCE
850b9fd52a
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-17 08:24:31 +02:00
Frédéric FRANCE
155e8fb500
fix syntax
2019-09-17 08:18:01 +02:00
Frédéric FRANCE
0d63c43ccd
add doaction to actioncommcard
2019-09-17 08:15:01 +02:00
Frédéric FRANCE
ecac1f9f40
wip
2019-09-17 08:02:55 +02:00
Frédéric FRANCE
a2d3cde291
some update after night
2019-09-17 07:59:46 +02:00
Frédéric FRANCE
fb7ef3cefc
Update card.php
2019-09-16 23:12:11 +02:00
Frédéric FRANCE
f369c1a80a
Update card.php
2019-09-16 20:59:13 +02:00
Frédéric FRANCE
67b73cf0e6
Update actioncomm.class.php
2019-09-16 20:57:20 +02:00
Laurent Destailleur
434ab2965a
Merge pull request #11820 from OPEN-DSI/new-resource-add-event-check-busy
...
NEW check if a resource is in use in an event
2019-09-15 15:47:07 +02:00
Laurent Destailleur
4d0ef33471
FIX #11857
2019-09-15 15:43:03 +02:00
Frédéric FRANCE
c9c7d60fc0
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-14 16:37:10 +02:00
Laurent Destailleur
56a99f6e6d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-12 11:22:13 +02:00
Laurent Destailleur
db900cb5ea
FIX EDB-ID:47370
2019-09-11 17:51:50 +02:00
Laurent Destailleur
61cf47aa16
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-10 00:14:07 +02:00
Laurent Destailleur
66a9fabd06
If you develop your own emailing target selector and used
...
parent::add_to_target(...), you must now use parent::addToTargets(...)
2019-09-09 14:18:25 +02:00
Laurent Destailleur
28ba5abb89
Clean code
2019-09-09 13:31:14 +02:00
VESSILLER
66611f4097
FIX rename "resource" (reserved) by "dolresource"
2019-09-09 09:29:43 +02:00
Frédéric FRANCE
bd4c9a64a8
wip
2019-09-07 14:48:25 +02:00
Laurent Destailleur
a5f7211730
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/install/repair.php
2019-09-06 16:10:55 +02:00
Laurent Destailleur
529dd05226
Replace deprecated code
2019-09-06 10:53:05 +02:00
Laurent Destailleur
bb81f66a1a
Add phpunit test for Lessc
2019-09-06 10:36:49 +02:00
VESSILLER
815d0bbc20
FIX rename "dolresource" into "resource" for compatibility with PR 11822
2019-09-05 11:57:12 +02:00
VESSILLER
9ed09db93c
FIX replace "<br />" by "<br>"
2019-09-05 09:41:15 +02:00
VESSILLER
4ef7e755ad
FIX only check on busy resources before updating an event
2019-09-05 09:29:40 +02:00
VESSILLER
b70587c150
NEW check if a resource is in use in an event
2019-09-04 15:14:16 +02:00
Laurent Destailleur
750182f9cd
Removed deprecated method actioncomm->add(), use create() instead
2019-09-04 13:54:36 +02:00
Laurent Destailleur
da3d230182
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.stickler.yml
htdocs/takepos/invoice.php
2019-09-03 17:34:49 +02:00
Laurent Destailleur
c32100c714
Merge pull request #11768 from atm-florian/10_fixeventlist
...
fix event list with description
2019-09-03 15:02:22 +02:00
Laurent Destailleur
52a543953c
Fix position of tests
2019-09-03 14:58:54 +02:00
Laurent Destailleur
17ccb8fa10
Fix missing tooltip
2019-09-03 14:56:13 +02:00
Laurent Destailleur
a95e02e3f6
FIX #11789 FIX #11790
2019-09-03 14:52:03 +02:00
Laurent Destailleur
98459363df
Merge pull request #11795 from jtraulle/fix-doxygen-examples
...
Fix Wrongly catched examples by Doxygen
2019-09-03 12:45:23 +02:00
Laurent Destailleur
6c96478040
Removed deprecated code
2019-09-02 22:57:55 +02:00
Laurent Destailleur
f54d4e3fc2
Replace deprecated code with new one
2019-08-31 02:34:54 +02:00
Laurent Destailleur
4a76dfa6ff
Fix link to setup
2019-08-30 18:23:43 +02:00
Jean Traullé
c32c7d48ba
Fix Wrongly catched examples by Doxygen
2019-08-30 17:14:59 +02:00
Laurent Destailleur
05c9e97fe4
The deprecated method get_OutstandingBill has been removed. You can use
...
getOutstandingBills() instead.
2019-08-29 00:45:02 +02:00
Laurent Destailleur
cb8bee7899
Responsive
2019-08-28 19:48:20 +02:00
Laurent Destailleur
9fd4f839ec
Use css "pictomodule" for picto of modules
2019-08-28 19:28:50 +02:00
Laurent Destailleur
931586269a
Fix td
2019-08-28 18:23:41 +02:00
Laurent Destailleur
042e9df720
Sort
2019-08-28 18:20:19 +02:00
Laurent Destailleur
d668b79738
NEW Add column tms into the table of targets for emailing
2019-08-28 18:14:46 +02:00
florian HENRY
243fca9a1a
fix event list with description
2019-08-27 16:12:07 +02:00
Laurent Destailleur
d304749eca
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-19 10:19:14 +02:00
Laurent Destailleur
18886c701d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/core/lib/company.lib.php
2019-08-19 00:02:26 +02:00
Laurent Destailleur
3f105a97bf
Debug the new workboard
2019-08-18 04:56:48 +02:00
Laurent Destailleur
5351d78a96
Merge branch 'develop' into develop_new_dashboard
2019-08-18 01:26:56 +02:00
Laurent Destailleur
b1be6bf4f2
FIX #11422 Can't edit his own events with standard rights
2019-08-18 01:24:54 +02:00
Laurent Destailleur
8874a0f3c1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-15 23:39:11 +02:00
Laurent Destailleur
386f929fe3
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/lib/website.lib.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
2019-08-15 23:39:02 +02:00
Laurent Destailleur
6430c74793
Merge pull request #11168 from hregis/develop_menu
...
NEW add new function "setEntity()" and better compatibility with Multicompany
2019-08-15 21:00:05 +02:00
Laurent Destailleur
f26a13ff13
NEW Removed deprecated code that create linked object from ->origin
2019-08-15 19:50:18 +02:00
Laurent Destailleur
ac8bf7b066
Update propal.class.php
2019-08-15 19:48:29 +02:00
Regis Houssin
7c8b3c9a38
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-08-13 07:34:02 +02:00
Juanjo Menent
7dab396d08
Fix: error creating a budget from an intervention
2019-08-12 17:29:25 +02:00
Laurent Destailleur
63efe82ff3
Merge pull request #11639 from ptibogxiv/patch-213
...
NEW list by date_cloture on propal list
2019-08-10 01:07:07 +02:00
Laurent Destailleur
14fabeb377
Variable rangtouse -> ranktouse
2019-08-10 00:46:20 +02:00
ptibogxiv
4de68397ae
NEW list by date_cloture on propal list
2019-08-05 21:03:48 +02:00
John Botella
b4c4e5a662
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard
2019-08-02 14:52:01 +02:00
Laurent Destailleur
d0de3ef08d
Merge pull request #11603 from bafbes/abb100067
...
Fix:syntax error in sql query
2019-08-01 16:06:01 +02:00
Laurent Destailleur
d7a41c6b72
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
2019-08-01 12:54:27 +02:00
John Botella
9b84987cc1
prepare new dashboard
2019-08-01 12:33:19 +02:00
Laurent Destailleur
5eb8f05061
FIX #11584
2019-08-01 12:23:02 +02:00
Abbes Bahfir
bf2d052d62
Fix:syntax error in sql query
2019-07-31 17:48:17 +01:00
Regis Houssin
d9ea61e47c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop_menu
Conflicts:
htdocs/commande/class/commande.class.php
2019-07-31 12:49:56 +02:00
Laurent Destailleur
11e3aa5860
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-29 11:07:11 +02:00
Laurent Destailleur
7931f0b422
Fix sql error
2019-07-29 11:06:39 +02:00
Laurent Destailleur
a5e3adc6f1
Fix travis
2019-07-29 10:51:17 +02:00
Laurent Destailleur
db461792a0
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-29 01:36:35 +02:00
Laurent Destailleur
9a7113f4f5
FIX Update the file index table when we validate/rename a ref.
2019-07-28 22:26:55 +02:00
Laurent Destailleur
9f7d118f6f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-27 02:40:56 +02:00
Laurent Destailleur
2867e31a63
Fix CSS
2019-07-27 01:13:39 +02:00
Laurent Destailleur
bef3423764
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
2019-07-22 19:12:27 +02:00
Laurent Destailleur
9f95b10d0e
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/comm/action/list.php
htdocs/comm/action/peruser.php
htdocs/compta/prelevement/card.php
htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
2019-07-22 19:11:27 +02:00
Laurent Destailleur
f39f710fd9
Merge pull request #11538 from atm-maxime/fix_agenda_list_filter
...
Fix lost filter in action list
2019-07-22 18:44:22 +02:00
Alexandre SPANGARO
2c74caff90
WIP
2019-07-22 06:56:55 +02:00
Maxime Kohlhaas
7ec8b48b18
Fix lost filter in action list
2019-07-21 22:21:11 +02:00
florian HENRY
b046bcc197
fix warning php
2019-07-20 15:19:25 +02:00
florian HENRY
d03d79222e
fix warning php
2019-07-20 15:15:48 +02:00
florian HENRY
d88fec52bf
fix warining message
2019-07-20 15:07:59 +02:00
Laurent Destailleur
865ebb9de2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/ticket/class/ticket.class.php
2019-07-20 13:29:10 +02:00
Laurent Destailleur
e5c3945ec3
FIX delete of links between objects
2019-07-19 18:10:45 +02:00
Regis Houssin
cbda42d146
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-07-19 09:37:34 +02:00
Laurent Destailleur
fc31a1182b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-18 18:54:50 +02:00
Laurent Destailleur
58428cefc0
Fix phpcs
2019-07-18 18:53:51 +02:00
Laurent Destailleur
50480bf517
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/opensurvey/index.php
2019-07-18 18:23:24 +02:00
Laurent Destailleur
3cffd70ed3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/prelevement/create.php
htdocs/core/class/commonobject.class.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/commande/dispatch.php
htdocs/fourn/product/list.php
htdocs/opensurvey/index.php
htdocs/ticket/index.php
htdocs/ticket/list.php
2019-07-18 18:09:37 +02:00
Laurent Destailleur
a20a121558
Merge pull request #11522 from atm-john/9.0_fix_action_list_contact_assigned
...
FIX: socpeople assigned list in action com list
2019-07-18 17:20:41 +02:00
John Botella
b5d348356d
Fix socpeople assigned list in action com list
2019-07-17 16:49:41 +02:00
Marc de Lima Lucio
464bda996c
FIX: propal createFrom hook: undefined parameter attached
2019-07-16 13:59:00 +02:00
Laurent Destailleur
0a7d70829f
Translation of some comments
2019-07-05 21:37:25 +02:00
Laurent Destailleur
2fee41f712
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-04 12:27:00 +02:00
Laurent Destailleur
8e3620fce1
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/facture/invoicetemplate_list.php
2019-07-04 12:26:17 +02:00
Laurent Destailleur
ee0a65e7fa
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/comm/action/card.php
2019-07-04 12:22:40 +02:00
Ferran Marcet
433835860c
FIX: When saving an action it didn't save the label based on the type of event if the label is empty and the type is customized
2019-07-03 13:12:41 +02:00
Laurent Destailleur
adb3062a9f
Work on nblignes -> nblines
2019-06-29 16:38:14 +02:00
ptibogxiv
7f11077f1e
Update propal.class.php
2019-06-25 18:16:11 +02:00
ptibogxiv
df0d540ffb
Update propal.class.php
2019-06-25 15:47:16 +02:00
Laurent Destailleur
fa476b4994
Properties ->libelle_incoterms were renamed into ->label_incoterms
2019-06-25 13:00:02 +02:00
Laurent Destailleur
5675e7c50e
Clean code of deprecated method
2019-06-22 18:19:40 +02:00
Laurent Destailleur
403d41ec30
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 11:55:33 +02:00
Laurent Destailleur
18348fea93
Fix sort on date on agenda list
2019-06-22 11:34:16 +02:00
Laurent Destailleur
a264a4766a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-20 03:45:04 +02:00
Laurent Destailleur
e99cf13ccf
Merge pull request #11225 from ATM-Nicolas/new_propal_list_column
...
NEW Add hidden option PROPOSAL_SHOW_INVOICED_AMOUNT (not reliable if one invoice is done on several order or several proposal)
2019-06-20 03:27:45 +02:00
Nicolas ZABOURI
2e4db8c83c
Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook
2019-06-19 08:39:05 +02:00
ICstage
820c420ae5
FIX Missing hooks
2019-06-18 14:07:52 +02:00
Frédéric FRANCE
f1d64ad164
Update peruser.php
2019-06-17 23:02:54 +02:00
Laurent Destailleur
a74eaaff4d
Fix sort of linked elements
2019-06-17 15:54:54 +02:00
Regis Houssin
6597c9f60d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-06-17 06:45:08 +02:00
Laurent Destailleur
e8b139d1c6
Fix repeated logs and fetch
2019-06-13 22:48:31 +02:00
Laurent Destailleur
900e860f6d
Fix list of events for BOM module
2019-06-12 19:32:29 +02:00
Laurent Destailleur
2be5e9615d
Fix look and field v10
2019-06-12 19:03:22 +02:00
Laurent Destailleur
330842d67e
Update list.php
2019-06-12 13:14:44 +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
Frédéric FRANCE
ad95b66842
Warning: A non-numeric value encountered
2019-06-06 10:12:01 +02:00
Laurent Destailleur
21a1e0d7b3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/categories/index.php
htdocs/comm/action/list.php
htdocs/comm/action/rapport/index.php
htdocs/compta/paiement.php
htdocs/compta/sociales/document.php
htdocs/compta/tva/document.php
htdocs/core/actions_massactions.inc.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/facture/paiement.php
htdocs/loan/document.php
htdocs/main.inc.php
2019-06-04 19:03:27 +02:00
Laurent Destailleur
ba68e3d7ff
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/website/class/website.class.php
2019-06-04 18:47:22 +02:00
Laurent Destailleur
36df2f1026
Fix css
2019-06-04 18:45:01 +02:00
Laurent Destailleur
7b3242693b
FIX default value for duration of validity can be set from generic
...
feature.
2019-06-04 18:17:07 +02:00
Regis Houssin
fc83585574
FIX use setEntity() to move code in multicompany module
2019-06-03 11:37:04 +02:00
Regis Houssin
7b8b1a9052
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-06-03 11:04:28 +02:00
Laurent Destailleur
57cfb4b007
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/class/website.class.php
2019-06-02 12:36:07 +02:00
Maxime Kohlhaas
6dd01e86e9
Fix : avoid warning and uniformize var use
2019-05-31 15:53:23 +02:00
Frédéric FRANCE
48d15032af
Update linkedobjectblock.tpl.php
2019-05-29 11:28:07 +02:00
Laurent Destailleur
2218994958
FIX Duplicate encoding on error message
2019-05-29 09:51:45 +02:00
Laurent Destailleur
15de8a9497
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/mailing/card.php
2019-05-27 19:25:53 +02:00
Laurent Destailleur
1c6ddd25c4
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-05-27 19:23:54 +02:00
Laurent Destailleur
93c395fe10
FIX confirmation of mass email sending + option MAILING_NO_USING_PHPMAIL
2019-05-27 19:22:51 +02:00
Regis Houssin
4f2f23f522
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-05-22 08:45:31 +02:00
Laurent Destailleur
45e6c14594
Merge pull request #11226 from ATM-Nicolas/fix_icon_with_padding
...
FIX : Padding on create project icon
2019-05-21 22:41:52 +02:00
Laurent Destailleur
a93cbd4320
FIX Look and feel v10
2019-05-21 21:47:25 +02:00
Laurent Destailleur
c3b9c08219
CSS
2019-05-21 21:36:48 +02:00
Laurent Destailleur
fdeb12a909
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/mailing/card.php
2019-05-21 21:18:40 +02:00
Laurent Destailleur
a7f5f3fb94
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-05-21 21:16:54 +02:00
Laurent Destailleur
dcf77520ea
FIX Error management when MAILING_NO_USING_PHPMAIL is set
2019-05-21 21:16:06 +02:00
Laurent Destailleur
22e897b1a1
Clean and prepare code to fix a SQL injection
2019-05-21 17:22:38 +02:00
Laurent Destailleur
eafc35b00f
Look and feel v10
2019-05-21 13:27:45 +02:00
Regis Houssin
2cf630c213
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-05-20 16:10:47 +02:00
ATM-Nicolas
5def839813
FIX : Padding on create project icon
2019-05-20 11:56:26 +02:00
ATM-Nicolas
d58603bd1e
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_propal_list_column
2019-05-20 09:13:37 +02:00
ATM-Nicolas
6be48e6952
NEW : Amount HT invoiced column in propal list
2019-05-20 08:59:44 +02:00
Laurent Destailleur
5f23cf7e2a
CSS
2019-05-19 13:51:47 +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
florian HENRY
ebe37df9db
scrunitizer
2019-05-18 16:19:44 +02:00
florian HENRY
47ae988b57
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2019-05-18 16:18:22 +02:00
florian HENRY
12a8008107
scrunitizer
2019-05-18 16:18:14 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
...
NEW : look and feel title button
2019-05-18 16:04:47 +02:00
Regis Houssin
b73df2698d
FIX better compatibility with Multicompany
2019-05-12 14:25:41 +02:00
Laurent Destailleur
3def11d5c9
Standardize translation
2019-05-10 19:32:46 +02:00
Laurent Destailleur
aaeb7dc9d6
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/holiday.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/filefunc.inc.php
htdocs/product/list.php
2019-05-10 17:45:33 +02:00
Laurent Destailleur
9de0e69456
FIX column project into list
2019-05-10 15:11:06 +02:00
Laurent Destailleur
22c548e80b
Fix sql
2019-05-10 14:46:43 +02:00
Laurent Destailleur
5625c94c44
Fix missing label on project tooltip
2019-05-10 14:40:15 +02:00
Laurent Destailleur
0e8184332e
Fix missing label on project tooltip
2019-05-10 14:39:05 +02:00
Laurent Destailleur
d8c1c24028
Fix syntax error
2019-05-09 19:46:10 +02:00
Laurent Destailleur
a5b1de4f6a
Fix tab that should not be visible
2019-05-09 17:52:55 +02:00
ATM-Nicolas
77d3f22163
NEW : Amount invoiced column in propal list
2019-05-07 14:39:16 +02:00
ATM-Nicolas
ab3ad77704
FIX : Sale representative column didn't increase nbfield variable on proposal list
2019-05-03 10:55:51 +02:00
Laurent Destailleur
4f9ea912ab
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/website.inc.php
2019-05-02 14:41:56 +02:00
Laurent Destailleur
79754eb326
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/comm/remx.php
2019-05-02 14:39:30 +02:00
Laurent Destailleur
90a1181dc5
Debug module Ticket
2019-05-01 20:41:03 +02:00
Frédéric FRANCE
d9a1c2b235
Fix do not delete all discount when splitting
2019-04-30 13:54:50 +02:00
Laurent Destailleur
ee5d50b905
css
2019-04-27 13:25:21 +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
Abbes Bahfir
dccc8b0be3
Fix:Same action in both cases
2019-04-24 08:48:36 +01:00
Laurent Destailleur
3b04d2fe9b
Fix warnings
2019-04-23 13:21:17 +02:00
Laurent Destailleur
7f4b09c482
Fix warnings
2019-04-23 13:20:44 +02:00
Laurent Destailleur
4d92d7731c
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/sendings.lib.php
htdocs/langs/en_US/admin.lang
htdocs/theme/eldy/style.css.php
2019-04-23 12:32:08 +02:00
Laurent Destailleur
84ec39f043
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-04-23 12:25:53 +02:00
Laurent Destailleur
bf7fcce1b2
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-04-23 12:24:25 +02:00
florian HENRY
f412ce6a9c
fix #11023
2019-04-17 10:49:39 +02:00
Laurent Destailleur
e6ffaeefe5
CSS
2019-04-17 10:39:30 +02:00
Laurent Destailleur
212b058f46
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2019-04-17 01:18:46 +02:00
Laurent Destailleur
b5bf6830e9
Introduce method convertBackOfficeMediasLinksToPublicLinks so links to
...
media added from filemanager in notes are visible by PDFs builder.
2019-04-17 01:13:59 +02:00
Laurent Destailleur
5c53044863
Merge pull request #11024 from ATM-Marc/FIX_7.0_sort_events
...
FIX: actioncomm: sort events by date after external calendars and hook
2019-04-16 23:28:30 +02:00
Laurent Destailleur
c0defe3965
Update index.php
2019-04-16 23:27:45 +02:00
Marc de Lima Lucio
1669d497b4
FIX: actioncomm: sort events by date after external calendars and hook
2019-04-16 17:36:27 +02:00
ATM john
292d9c38a5
Appli function to links
2019-04-15 00:21:58 +02:00
ATM john
29b31bd7ab
New title button first step
2019-04-11 00:38:44 +02:00
Laurent Destailleur
d7f980fda0
NEW Add picto of deletion on mass action combo lists
2019-04-09 01:22:59 +02:00
Laurent Destailleur
7b01e76d2b
Fix doxygen
2019-04-08 16:04:15 +02:00
Frédéric FRANCE
4d43cd4927
Update card.php
2019-04-05 14:46:31 +02:00
Laurent Destailleur
1b2826f476
Look and feel v10
2019-03-29 13:26:26 +01:00
Laurent Destailleur
661a984b8e
Merge pull request #10880 from altatof/condpay
...
allow empty value for payment conditions like in orders
2019-03-26 20:53:20 +01:00
Laurent Destailleur
a34f4c2806
Merge pull request #10909 from IonAgorria/fix-line-dates
...
FIX: Disallow line start date after end date
2019-03-26 19:43:11 +01:00
Laurent Destailleur
f27f65e8bf
Responsive
2019-03-25 10:09:02 +01:00
Ion
7bfa49b29c
FIX: Disallow line start date > end date
2019-03-24 14:30:00 +01:00
Laurent Destailleur
28fede950f
Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into
...
MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
2019-03-22 13:00:48 +01:00
Laurent Destailleur
a7181750c6
Merge pull request #10879 from altatof/noconcatdesc
...
NEW : add constant NO_CONCAT_DESCRIPTION
2019-03-22 12:56:46 +01:00
Philippe GRAND
62d63e399e
translation
2019-03-22 09:41:22 +01:00
Laurent Destailleur
48a0c447b4
Fix test on draft status regression
2019-03-21 21:00:06 +01:00
Laurent Destailleur
930720decd
WIP Start to replace use of property ->brouillon
2019-03-21 18:13:51 +01:00
Laurent Destailleur
90df30e412
NEW Add trigget FICHINTER_UNVALIDATE
...
Standardize code of setDraft.
2019-03-21 17:37:56 +01:00
Frédéric FRANCE
013e536f32
Update actioncomm.class.php
2019-03-19 12:49:54 +01:00
Laurent Destailleur
b10690ce88
Merge pull request #10874 from grandoc/translation
...
translation
2019-03-19 11:14:40 +01:00
Christophe Battarel
bd542b6b22
allow empty value for payment conditions like in orders
2019-03-18 16:39:59 +01:00
Christophe Battarel
8b3fd2eacf
NEW : add constant NO_CONCAT_DESCRIPTION
2019-03-18 16:10:17 +01:00
Philippe GRAND
0f03b16313
translation
2019-03-18 12:46:32 +01:00
Philippe Grand
7942903548
Update actioncomm.class.php
2019-03-18 12:24:16 +01:00
Philippe GRAND
76a4792cd2
Merge remote-tracking branch 'upstream/develop' into new_branch_18_03_2019
2019-03-18 12:11:57 +01:00
Laurent Destailleur
de554750e4
Merge pull request #10802 from altatof/propindex
...
Harmonize propal index pages
2019-03-18 10:56:10 +01:00
Laurent Destailleur
22d61cd44d
Update index.php
2019-03-18 10:55:44 +01:00
Laurent Destailleur
7adba419fc
Update index.php
2019-03-18 10:54:45 +01:00
Laurent Destailleur
d8c1a50291
Update index.php
2019-03-18 10:53:58 +01:00
Philippe GRAND
198cf4af2f
add comments
2019-03-18 10:06:22 +01:00
Laurent Destailleur
7cdfff7263
Fix syntax error
2019-03-15 20:42:49 +01:00
Laurent Destailleur
c0b6699b25
All methods set_draft() were renamed into setDraft()
2019-03-15 19:01:40 +01:00
Laurent Destailleur
0afbd70c2c
Merge pull request #10833 from grandoc/new_branch_14_03_2019
...
update with html5 compliant code
2019-03-14 18:04:06 +01:00
Laurent Destailleur
d4f2a16abf
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
2019-03-14 17:10:58 +01:00
Laurent Destailleur
cdf6e4b65a
Fix some PSR rules
2019-03-14 16:43:27 +01:00
John BOTELLA
31e588dbab
fix hookmanager global
2019-03-14 16:13:32 +01:00
John BOTELLA
8bc795c055
Fix missing hook for export agenda
2019-03-14 15:19:38 +01:00
Philippe GRAND
43b827aae7
update with html5 compliant code
2019-03-14 14:07:26 +01:00
Laurent Destailleur
e7cd8d690c
Remove warnings
2019-03-13 19:06:45 +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
17647de4cc
Fix extrafields calls from cards for Dolibarr 8 See #10803
2019-03-12 11:24:54 +01:00
Christophe Battarel
2726cc335d
replace align by css align
2019-03-12 10:24:11 +01:00
Joan Louis
f326c75be7
Update call to extrafields from cards
2019-03-11 21:34:16 +01:00
Laurent Destailleur
e913f1919f
Merge pull request #10803 from joanlouis/fix-extrafields-calls-from-cards
...
Update call to extrafields from cards
2019-03-11 21:14:53 +01:00
Laurent Destailleur
abdc2aa21a
Fix phpcs
2019-03-11 21:03:23 +01:00
Laurent Destailleur
3559d600e2
Merge pull request #10770 from atm-john/theme_badge_status
...
Add badge status css part1
2019-03-11 20:49:31 +01:00
Laurent Destailleur
052d29d946
Fix phpcs
2019-03-11 20:45:28 +01:00
Laurent Destailleur
6daa262779
Files for variables of themes were renamed from graph-color.php into
...
theme_vars.inc.php to match naming convention of extension .inc.php for
files to be included.
2019-03-11 20:32:25 +01:00
John BOTELLA
57c6c60118
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
2019-03-11 14:44:35 +01:00
Joan Louis
ee5753819e
Update call to extrafields from cards
2019-03-11 14:22:04 +01:00
Christophe Battarel
be612a1f6e
harmonize propal index pages
2019-03-11 12:58:03 +01:00
John BOTELLA
97544e0aea
add new dolGetStatus to LibStatut in common invoice class
2019-03-07 15:24:11 +01:00
Laurent Destailleur
a40a08bada
Merge pull request #10753 from OPEN-DSI/fix-comm-action-contactid
...
Fix default contact id for update and clone actions in event card
2019-03-07 13:12:22 +01:00
John BOTELLA
5ea5d51247
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
2019-03-07 09:41:03 +01:00
Lionel VESSILLER
b56cd11f02
Fix default contact id for update and clone actions in event card
2019-03-06 12:00:55 +01:00
Frédéric FRANCE
2745f98644
PSR2.Classes.PropertyDeclaration.VarUsed
2019-03-05 22:10:46 +01:00
Frédéric FRANCE
0c2a77cb53
Merge remote-tracking branch 'upstream/develop' into patch-2
2019-03-05 18:14:15 +01:00
John BOTELLA
72d96d2ac3
prepare badges
2019-03-05 17:13:20 +01:00
Laurent Destailleur
b851911708
Dolibarize module ticket
2019-03-05 12:18:46 +01:00
Frédéric FRANCE
f283782445
change visibility
2019-03-04 19:57:46 +01:00
Laurent Destailleur
66d8b8e7a1
Fix phpcs
2019-03-02 21:04:44 +01:00
Laurent Destailleur
8fce6e5e31
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/core/modules/mailings/xinputfile.modules.php
htdocs/fourn/facture/card.php
2019-03-02 19:13:37 +01:00
Laurent Destailleur
40e923ec85
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/modules/modAgenda.class.php
2019-03-02 19:07:14 +01:00
Laurent Destailleur
4f9981063f
Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing
2019-03-02 18:26:50 +01:00
Laurent Destailleur
56d921ea52
CSS
2019-03-02 12:57:07 +01:00
Frédéric FRANCE
014f69850e
add visibility
2019-03-01 23:08:57 +01:00
Laurent Destailleur
855aaaffd8
Better fix for type of discount
2019-02-28 11:44:10 +01:00
florian HENRY
4ebf4780c2
fix relative discount for prospect and supplier
2019-02-28 09:09:06 +01:00
Frédéric FRANCE
9b165f6b3f
add visibility
2019-02-27 20:45:07 +01:00
Laurent Destailleur
2448d1deaa
fk_projet -> fk_project
2019-02-27 15:32:18 +01:00
Laurent Destailleur
3ec2338c2d
Look and feel v10
2019-02-26 19:37:32 +01:00
Frédéric FRANCE
894123fb06
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
2019-02-24 20:06:55 +01:00
Regis Houssin
36a7303049
FIX No space found after comma in function call
2019-02-19 10:28:17 +01:00
Laurent Destailleur
e4698fb6a5
Merge
2019-02-18 19:14:25 +01:00
Laurent Destailleur
75b875ae55
Fix origin currency not visible in absolute discount view
2019-02-18 17:38:15 +01:00
Laurent Destailleur
7a79637b88
Merge pull request #10616 from frederic34/patch-27
...
Update pertype.php
2019-02-15 15:31:03 +01:00
Frédéric FRANCE
c7cec4be34
Update peruser.php
2019-02-14 21:45:40 +01:00
Frédéric FRANCE
b65532c5d8
Update pertype.php
2019-02-14 21:43:46 +01:00
Frédéric FRANCE
7886b5900c
Update card.php
2019-02-14 20:40:03 +01:00
Laurent Destailleur
a7af1b1765
Remove deprecated code
2019-02-14 16:29:13 +01:00
ptibogxiv
1771ea8eaa
Update api_proposals.class.php
2019-02-14 00:27:53 +01:00
ptibogxiv
56a0a20bb3
Fix delete contact
2019-02-14 00:27:29 +01:00
Laurent Destailleur
b9467c10bf
Merge pull request #10561 from eoxia-jimmy/develop
...
NEW: API Proposal, Orders, Invoices: Add contact details
2019-02-13 16:39:57 +01:00
Laurent Destailleur
c2ab85aaf8
Update api_proposals.class.php
2019-02-13 16:39:17 +01:00
Frédéric FRANCE
95212e9cc1
Update ical.class.php
2019-02-13 00:44:34 +01:00
Frédéric FRANCE
3de192364b
Update ical.class.php
2019-02-13 00:12:20 +01:00
Jimmy L
a172ea00a4
Rest API: Proposal, Orders, Invoices: Add contact details
2019-02-12 17:54:59 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
2019-02-12 13:33:39 +01:00
klemens
beb2791dde
spelling fixes
2019-02-10 12:59:09 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
Laurent Destailleur
0e42e8824b
Merge branch 'develop' into new_branch_04_02_2019
2019-02-08 09:42:18 +01:00
Laurent Destailleur
af92303319
Merge pull request #10487 from frederic34/psr2squizwhite
...
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-08 09:30:25 +01:00
Laurent Destailleur
88fb491441
Fix note output
2019-02-06 00:40:07 +01:00
Laurent Destailleur
58e6cfd635
Fix popup content
2019-02-06 00:36:11 +01:00
Philippe GRAND
577aef54e1
update with html5 compliant code
2019-02-04 10:37:51 +01:00
Philippe GRAND
1154f9a048
update with html5 compliant code
2019-02-04 10:35:53 +01:00
Philippe GRAND
eb25d12a1b
update with html5 compliant code
2019-02-04 10:32:33 +01:00
Philippe GRAND
7c8d84aa03
update with html5 compliant code
2019-02-04 10:27:26 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
Laurent Destailleur
57f81217ee
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/localtax/index.php
htdocs/compta/tva/index.php
2019-02-03 21:14:44 +01:00
Laurent Destailleur
efe5cd3dd8
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-02-03 21:13:06 +01:00
Laurent Destailleur
72f78ecf3b
FIX #10460 compatibility with MariaDB 10.4
2019-02-03 20:02:05 +01:00
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma
2019-02-03 19:27:16 +01:00
Laurent Destailleur
9f7dfe2921
Merge pull request #10481 from frederic34/psr2forloop
...
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
2019-02-03 19:11:07 +01:00
Laurent Destailleur
e309261140
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-03 18:19:58 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-03 14:29:45 +01:00
Frédéric FRANCE
03701fa091
psr2
2019-02-02 18:25:01 +01:00
Laurent Destailleur
ebe30f7a0e
FIX error report not returned
2019-02-01 19:19:23 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
Philippe GRAND
1501ce2c9f
update with html5 compliant code
2019-01-31 13:34:32 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma
2019-01-30 16:00:11 +01:00
Laurent Destailleur
869159c09f
Fix regression in look and feel (if empty, we do not sho value)
2019-01-30 15:31:39 +01:00
Laurent Destailleur
1a292839ca
Fix regression in look and feel (if empty, we do not sho value)
2019-01-30 15:31:18 +01:00
Laurent Destailleur
17c3337c9b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-30 15:25:43 +01:00
Regis Houssin
39b696af02
FIX multicompany compatibility
2019-01-29 12:01:40 +01:00
Alexandre SPANGARO
cc88c4f8ff
Move my email to the new one
2019-01-28 21:39:22 +01:00
Frédéric FRANCE
ff39491f15
wip
2019-01-27 23:31:37 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +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
f96d730943
Merge pull request #10391 from grandoc/new_branch_22_01_2019
...
update with html5 compliant code
2019-01-26 14:09:15 +01:00
Laurent Destailleur
adb7ec7015
Merge pull request #10399 from grandoc/new_branch_23_01_2019
...
update with html5 compliant code
2019-01-26 14:02:26 +01:00
Laurent Destailleur
e42fe4022a
Uniformize lenght of small list
2019-01-25 15:22:36 +01:00
Philippe GRAND
6625dac8d7
update with html5 compliant code
2019-01-23 17:28:02 +01:00
Philippe GRAND
34b6f5705e
update with html5 compliant code
2019-01-22 14:09:14 +01:00
Philippe GRAND
4668052f95
update with html5 compliant code
2019-01-22 14:04:33 +01:00
Laurent Destailleur
844643c37d
Merge pull request #10375 from grandoc/new_branch_19_01_2019
...
update with html5 compliant code
2019-01-20 19:48:32 +01:00
Laurent Destailleur
300889f53a
# WARNING: head commit changed in the meantime
...
Fix
2019-01-19 13:22:38 +01:00
Laurent Destailleur
55c90b0578
Fix #10359 cloning of proposal
2019-01-19 13:17:07 +01:00
Laurent Destailleur
2bbaae88d6
Fix standardize 'createfromclone' param when cloning
2019-01-19 12:46:38 +01:00
Philippe GRAND
66e4bc4502
update with html5 compliant code
2019-01-19 12:27:26 +01:00
Laurent Destailleur
5130019003
css
2019-01-17 19:27:26 +01:00
Philippe GRAND
bd929c2d1e
update with html5 compliant code
2019-01-17 14:24:41 +01:00
atm-quentin
013c078c8b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice
2019-01-16 10:52:46 +01:00
Marc de Lima Lucio
1cfd52e7e2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_actionlist_desc
2019-01-09 12:08:55 +01:00
Marc de Lima Lucio
de7dfd3423
NEW: actioncomm list: add description column (hidden by default)
2019-01-09 11:54:03 +01:00
Laurent Destailleur
d929d93376
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-08 14:19:35 +01:00
Laurent Destailleur
acc665a9f1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/class/html.form.class.php
2019-01-08 14:16:23 +01:00
Laurent Destailleur
1ee0d42408
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-01-08 14:08:22 +01:00
Marc de Lima Lucio
68802c659e
FIX: action list: add printFieldListSelect and printFieldListWhere hooks
2019-01-08 11:41:58 +01:00
ldestailleur
bc00fb177a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-02 19:42:15 +01:00
ldestailleur
3af418349a
FIX Can't empty the payment mode
2018-12-29 07:54:30 +01:00
ldestailleur
c0eef25b31
FIX Can set payment mode to empty on thirdparty page
2018-12-28 23:14:36 +01:00
ldestailleur
8ad06463e0
FIX Can set payment mode to empty on thirdparty page
2018-12-28 23:06:04 +01:00
Laurent Destailleur
a445e7597d
FIX Popup when having notes of events
2018-12-27 06:37:17 +01:00
Laurent Destailleur
fadc9983dc
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-27 06:18:03 +01:00
Laurent Destailleur
cd53e22d64
FIX Edit description of event
2018-12-27 06:16:54 +01:00
Laurent Destailleur
f55db6dd84
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/resources/dbmodel/dolibarr_schema.mwb
2018-12-15 14:09:16 +01:00
Laurent Destailleur
e069da69ba
Revert "Fix screen size fall"
...
This reverts commit abb6b41f91
2018-12-15 12:35:37 +01:00
John BOTELLA
4fa10296f4
Fix screen size fall
2018-12-15 12:34:41 +01:00
Laurent Destailleur
dbe5d285e8
Merge pull request #9965 from atm-john/fix_responsive
...
FIX screen size fall
2018-12-15 12:33:35 +01:00
Laurent Destailleur
b511a056f4
Fix phpcs
2018-12-15 11:48:21 +01:00
Laurent Destailleur
baf9b6f309
Fix regression (bad name of function)
2018-12-14 19:21:19 +01:00
Laurent Destailleur
38ddfd9a62
Merge pull request #10152 from defrance/patch-134
...
refactoring list.php with dol_sql_datefilter
2018-12-14 19:06:29 +01:00
Laurent Destailleur
3571eaee3d
Merge branch 'develop' into NEW_change_order_concat_desc
2018-12-14 17:44:08 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused
2018-12-14 15:48:24 +01:00
Laurent Destailleur
83efdee7d3
Merge branch 'develop' into new_mass_generate
2018-12-14 15:44:46 +01:00
Laurent Destailleur
611ccc4a9a
Merge branch 'develop' into fieldlabel
2018-12-14 15:42:01 +01:00
Laurent Destailleur
233e160489
Merge pull request #9874 from atm-john/New_import_lines_from_linked_element_step2
...
NEW Extend import option to Order's card and Propal's card
2018-12-14 15:29:27 +01:00
Laurent Destailleur
5dabefe227
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2018-12-13 20:49:55 +01:00
Laurent Destailleur
f97b561af0
Merge branch 'develop' into qual_rename_facnumber
2018-12-13 20:24:12 +01:00
Laurent Destailleur
210c937725
Merge pull request #10213 from inoveaconseil/patch-5
...
NEW: Add note in tooltips
2018-12-13 20:06:13 +01:00
Laurent Destailleur
4a61c1b6ed
FIX lang not loaded
2018-12-11 13:25:09 +01:00
Laurent Destailleur
5ec9a1ca7f
Remove deprecated parameter
2018-12-11 10:15:13 +01:00
Laurent Destailleur
434cf2e046
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-11 09:58:14 +01:00
Laurent Destailleur
a107d16338
Revert "clean and update code"
...
This reverts commit 68de0ba93b
2018-12-11 09:52:00 +01:00
Laurent Destailleur
b47e7b2267
Work on new unsubscribe process
2018-12-11 09:49:46 +01:00
Inovea Conseil
9bfcabc8c9
NEW: Add note in tooltips
2018-12-10 16:09:56 +01:00
Laurent Destailleur
138640fc63
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/contrat/class/contrat.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2018-12-04 14:58:11 +01:00
Laurent Destailleur
8e333c3feb
Standardize code
2018-12-04 14:54:58 +01:00
Laurent Destailleur
d80baaea69
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/contrat/class/contrat.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
2018-12-04 14:29:47 +01:00
Ferran Marcet
7247b14bd9
FIX Lines are not inserted correctly if VAT have code
2018-12-03 12:28:17 +01:00
Ferran Marcet
8312d57d16
FIX Lines are not inserted correctly if VAT have code
2018-12-03 11:58:39 +01:00
Maxime Kohlhaas
2e496ea83a
QUAL rename facnumber by ref
2018-12-02 17:33:44 +01:00
BENKE Charlene
21b55f3a83
refactoring dol_sql_datefilter
2018-12-01 23:30:58 +01:00
Laurent Destailleur
6d84036f66
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/index.php
htdocs/contact/list.php
htdocs/core/class/html.form.class.php
htdocs/expensereport/card.php
htdocs/install/doctemplates/shipment/template_shipment.odt
htdocs/public/payment/newpayment.php
2018-12-01 19:23:06 +01:00
florian HENRY
7a182c7880
fix #10069
2018-11-30 23:25:44 +01:00
Inovea Conseil
ad7117be60
FIX mass action closed proposal
2018-11-30 15:05:28 +01:00
BENKE Charlene
10bf7bdc95
Duplicate declaration of $object
...
Already present line 126
2018-11-29 10:29:04 +01:00
Laurent Destailleur
3b66a2bf9c
Fix missing email in popup
2018-11-28 14:20:55 +01:00
Laurent Destailleur
0367795488
Fix auto jump on record if only 1 record in a search
2018-11-27 11:09:47 +01:00
Laurent Destailleur
f0e4c262a3
Merge pull request #10067 from ATM-Thibault/NEW_global_search_go_direct_on_card
...
FIX Support of option MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE was not complete
2018-11-24 11:13:49 +01:00
Laurent Destailleur
5bd9c14929
Update demo data for 8.0 and 9.0
2018-11-23 14:05:45 +01:00
Thibault Descamps
c2e5a29246
NEW redirect if only one result on global search on card
2018-11-22 11:36:30 +01:00
Thibault Descamps
1cc130e5f6
NEW : conf to change concat desc order
2018-11-21 09:57:44 +01:00
Frédéric FRANCE
8f17ae8df5
GETPOSTISSET has only one parameter
2018-11-19 20:28:55 +01:00
Laurent Destailleur
39621ec686
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
2018-11-19 20:07:51 +01:00
Laurent Destailleur
25ee999d27
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-11-19 20:05:32 +01:00
Laurent Destailleur
2f87ee6640
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-19 15:56:38 +01:00
Laurent Destailleur
f85ab8d0a6
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/card.php
2018-11-19 15:55:41 +01:00
Laurent Destailleur
5f93315097
Clean code
2018-11-19 15:14:46 +01:00
Laurent Destailleur
0886928a64
FIX Link between action and project must use field not the link table
2018-11-19 14:38:30 +01:00
Laurent Destailleur
1e1ccd4c88
Fix pagination in action/event list
2018-11-19 14:25:34 +01:00
florian HENRY
dc2f1e9812
fix list agenda extrafield visibility
2018-11-19 11:25:48 +01:00
atm-quentin
c18f486179
set facture to invoice AND check invoicenumber conf
2018-11-16 11:20:03 +01:00
atm-quentin
a8ab666d62
remplacement en masse des $conf->entity par des getEntity('facture')
2018-11-16 11:17:18 +01:00
Frédéric FRANCE
ce6b7adaa0
Merge remote-tracking branch 'upstream/develop' into actionrefused
2018-11-15 22:15:45 +01:00
Frédéric FRANCE
12dcda7e02
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-11-15 22:01:36 +01:00
Regis Houssin
0592e8a31c
FIX config is override by multicompany module
2018-11-14 16:44:10 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused
2018-11-13 21:40:17 +01:00
Regis Houssin
04edcaa89c
FIX compatibility between proposal sharing and proposalnumber sharing
2018-11-13 20:20:46 +01:00
gauthier
f404cae546
FIX : Same on customer card
2018-11-12 16:04:42 +01:00
gauthier
66ea8bbe87
FIX : fourn payment modes musn't be available on customer docs
2018-11-12 15:58:41 +01:00
Laurent Destailleur
84983140b6
Merge pull request #9896 from hregis/develop_email
...
FIX change my deprecated email
2018-11-11 17:35:35 +01:00
Laurent Destailleur
de259e9db6
Code comment
2018-11-11 14:36:35 +01:00
Frédéric FRANCE
09efde4901
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-11-09 18:13:59 +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
Laurent Destailleur
3e844db74f
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fichinter/stats/index.php
2018-11-08 20:19:28 +01:00
Laurent Destailleur
be788e6167
FIX responsive
2018-11-08 19:57:31 +01:00
Laurent Destailleur
46db246273
Look and feel v9: Autofocus on create forms
2018-11-07 13:04:43 +01:00
Laurent Destailleur
66ffcf287a
Fix filter on extrafields
2018-11-07 12:49:17 +01:00
John BOTELLA
abb6b41f91
Fix screen size fall
2018-11-07 11:25:13 +01:00
Laurent Destailleur
4a25317f10
Fix security on GETPOST('action'). Param must be sanitized.
2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e
FIX sanitize param $action
2018-11-05 17:53:31 +01:00
Laurent Destailleur
68ec172798
Fix setup to enable reminder b email
2018-11-03 12:37:52 +01:00
Frédéric FRANCE
fe5056add8
remove fieldlabel and add fieldeditkey
2018-10-27 18:07:05 +02:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Laurent Destailleur
852b069785
Fix reponsive in stats pages
2018-10-26 15:46:17 +02:00
atm-john
759b2b6ccf
Extend import option to Order's card and Propal's card
2018-10-25 21:39:22 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-24 23:04:26 +02:00
Laurent Destailleur
01adaf253c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/product/list.php
2018-10-24 03:35:44 +02:00
Laurent Destailleur
23a9416c19
Fix deprecated field
2018-10-23 23:51:27 +02:00
Laurent Destailleur
c8aa884462
Fix search all
2018-10-23 17:16:46 +02:00
Laurent Destailleur
9959ba3662
Merge pull request #9761 from frederic34/patch-20
...
Update actioncomm.class.php
2018-10-16 20:29:15 +02:00
Laurent Destailleur
2c1e8d6535
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/expedition/class/expeditionbatch.class.php
htdocs/public/payment/newpayment.php
htdocs/stripe/config.php
2018-10-16 18:47:11 +02:00
Frédéric FRANCE
cab9c81ce2
Update actioncomm.class.php
2018-10-15 21:53:54 +02:00
Laurent Destailleur
743d4d7c01
NEW add option PROPOSAL_AUTO_ADD_AUTHOR_AS_CONTACT
2018-10-15 16:40:40 +02:00
Maxime Kohlhaas
d4d921b1cc
Add massaction generate on main lists
2018-10-14 16:27:59 +02:00
Laurent Destailleur
532e05c42e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
2018-10-13 14:29:51 +02:00
Laurent Destailleur
c15505bc13
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-10-13 14:27:50 +02:00
Marc de Lima Lucio
afd9b4ea1a
FIX: propal pdf: missing parenthesis for customs code
2018-10-12 18:19:17 +02:00
Laurent Destailleur
1d04ce2185
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-10-09 17:07:32 +02:00
Laurent Destailleur
01c32525df
Merge
2018-10-09 17:06:08 +02:00
Laurent Destailleur
0938ac4afa
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/user/list.php
2018-10-09 14:54:18 +02:00
Laurent Destailleur
3c8b365c3e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-09 14:53:39 +02:00
Laurent Destailleur
4d959bbea7
Fix consistency of label of proposal status
2018-10-09 14:06:45 +02:00
Laurent Destailleur
bc4ddce314
Merge pull request #9713 from frederic34/patch-9
...
Update index.php
2018-10-09 12:43:32 +02:00
Frédéric FRANCE
b615d03b0b
Update index.php
2018-10-09 12:17:51 +02:00
Philippe GRAND
af0bcb2631
Standardize code
2018-10-09 09:40:00 +02:00
Philippe GRAND
ac214a7258
Standardize code
2018-10-09 08:53:08 +02:00
Laurent Destailleur
91038af84d
FIX properties on proposal must not be modified if error
2018-10-08 18:15:46 +02:00
Laurent Destailleur
c930218dd2
FIX Missing transaction around action
2018-10-08 17:40:17 +02:00
Philippe GRAND
da560289e3
Standardize code
2018-10-05 15:48:38 +02:00
atm-ph
bfaf25ca2a
Fix wrong value for module part and return access denied
2018-10-04 16:55:16 +02:00
Alexey Pyltsyn
49de7a5881
Replace multiple load calls with loadLangs method
2018-10-01 09:22:23 +03:00
Laurent Destailleur
e2f450aa8c
Fix regession losing description.
...
Rename updateligne into updateline.
2018-09-28 16:15:17 +02:00
Laurent Destailleur
26d20d0b76
Merge pull request #8729 from atm-quentin/NEW_rights_ignoring_min_price
...
NEW Advanced permission to ignore price min
2018-09-27 09:57:49 +02:00
Laurent Destailleur
d9ccc7624b
Standardize code
2018-09-23 16:09:25 +02:00
Laurent Destailleur
6c814b32bd
Standardize cod
2018-09-23 15:58:33 +02:00
Laurent Destailleur
5bd538fb2c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/modules/modStripe.class.php
htdocs/filefunc.inc.php
htdocs/projet/element.php
2018-09-20 23:43:34 +02:00
Laurent Destailleur
eb80c5c338
Fix translation not loaded and test on multicompany
2018-09-20 19:45:13 +02:00
John BOTELLA
83d3e5ec39
NEW : can add project's task to agenda on create event card
2018-09-20 10:17:43 +02:00
Laurent Destailleur
a546ef7f2d
FIX default day
2018-09-19 20:01:25 +02:00
Laurent Destailleur
92aa6929de
Fix go back on agenda view on correct page
2018-09-19 17:03:13 +02:00
Laurent Destailleur
824b572bd0
FIX Amount when using mutlicurrency on PDF
...
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
2018-09-19 15:03:24 +02:00
Frédéric FRANCE
1d43c6bc3a
call to deprecated add_object_linked was present two times
2018-09-19 10:57:59 +02:00
Laurent Destailleur
03928a914d
Merge pull request #9537 from frederic34/patch-20
...
reduce complexity of actioncomm reminder class
2018-09-18 15:08:46 +02:00
Frédéric FRANCE
beb7a0609c
reduce complexity of actioncomm reminder class
2018-09-16 19:06:21 +02:00
Frédéric FRANCE
7b37c41cfb
reduce complexity of actioncomm class
2018-09-16 19:04:43 +02:00
Laurent Destailleur
ab0f842db6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-16 12:55:44 +02:00
Laurent Destailleur
74a9c680df
FIX "Other ..." link so the "Back to" link works.
2018-09-16 12:27:56 +02:00
Laurent Destailleur
4efab446d0
Merge pull request #9508 from frederic34/patch-15
...
reduce complexity of libstatut propal.class.php
2018-09-15 17:24:59 +02:00
Laurent Destailleur
80fb1e0657
NEW Each user can set its prefered default calendar
2018-09-14 11:23:15 +02:00
Frédéric FRANCE
bcc9a3d259
reduce complexity of libstatut propal.class.php
2018-09-13 21:45:46 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 21:29:41 +02:00
Frédéric FRANCE
3e71f4e6b0
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 18:36:49 +02:00
Frédéric FRANCE
998b67fa98
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-12 18:32:15 +02:00
Laurent Destailleur
6291f18179
Merge pull request #9440 from frederic34/patch-5
...
Upper Lower Casing
2018-09-12 18:24:02 +02:00
Laurent Destailleur
fcabe67e4b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-12 13:30:28 +02:00
Frédéric FRANCE
f02b2f0239
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-09 13:35:58 +02:00
Frédéric FRANCE
fa895b2c2d
replace select_date
2018-09-09 11:30:40 +02:00
Frédéric FRANCE
a558c3bdac
replace select_date
2018-09-09 11:25:59 +02:00
Frédéric FRANCE
8249756726
replace select_date
2018-09-09 10:40:00 +02:00
Frédéric FRANCE
14bc8ed18d
Update multiprix.php
2018-09-08 23:19:11 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-08 10:50:27 +02:00
Philippe GRAND
97c740f510
Merge branch 'develop' of github.com:grandoc/dolibarr into develop
2018-09-06 19:28:10 +02:00
Laurent Destailleur
ff05997f0a
FIX Several fixes on the management of minimal amount for orders
2018-09-06 17:37:02 +02:00
Frédéric FRANCE
4e619dd0ed
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-05 18:51:21 +02:00
Frédéric FRANCE
aa74d2ac38
Update api_agendaevents.class.php
2018-09-04 23:53:37 +02:00
Laurent Destailleur
ab8155f170
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
2018-09-04 21:35:43 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-04 20:48:35 +02:00
Philippe Grand
c32c67ca57
Merge branch 'develop' into develop
2018-09-04 16:58:59 +02:00
Philippe GRAND
707f8b7312
fix merge
2018-09-04 14:49:56 +02:00
Laurent Destailleur
3d50c454c1
Code comment
2018-09-03 17:05:44 +02:00
Philippe GRAND
7a0c19485e
fix merge
2018-09-03 09:34:08 +02:00
Frédéric FRANCE
35232b753a
move phpcs:ignore
2018-09-02 20:37:12 +02:00
Frédéric FRANCE
03a5aba8a2
move phpcs:ignore
2018-09-02 18:49:23 +02:00
Frédéric FRANCE
e13a8ec572
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-02 18:19:45 +02:00
Frédéric FRANCE
4ea582ad4a
move phpcs:ignore
2018-09-02 11:12:07 +02:00
Philippe GRAND
3de16a145e
Standardize and update code
2018-09-02 11:08:41 +02:00
Frédéric FRANCE
b60f7db60a
move phpcs:ignore
2018-09-02 10:43:34 +02:00
Frédéric FRANCE
47879d44bc
move phpcs:ignore
2018-09-02 09:57:19 +02:00
Frédéric FRANCE
e98b8e5e25
move phpcs:ignore
2018-09-02 09:27:59 +02:00
Frédéric FRANCE
71977514d7
Update actioncommreminder.class.php
2018-09-02 09:06:51 +02:00
Frédéric FRANCE
3e723af018
start changing phpcs:ignore
2018-09-01 23:46:13 +02:00
Philippe GRAND
ae2df6be11
Standardize and Update code
2018-09-01 23:04:46 +02:00
Philippe GRAND
5d273960dc
fix conflict
2018-09-01 22:40:38 +02:00
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps
...
mark non camelCaps function
2018-09-01 15:37:56 +02:00
Philippe GRAND
f77dd2ebc7
Standardize and update code
2018-09-01 15:13:59 +02:00
Philippe GRAND
c013f9cf3d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 15:13:04 +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
Frédéric FRANCE
10200374ef
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 14:06:23 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 13:52:51 +02:00
Philippe GRAND
7354e485b0
precise label comment
2018-09-01 13:22:08 +02:00
Philippe GRAND
d8e6492e93
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 13:07:30 +02:00
Laurent Destailleur
5604f3b0c3
Merge pull request #9376 from frederic34/functionCommentMissing
...
function Comment Missing
2018-09-01 12:59:32 +02:00
Philippe GRAND
1944ef0dc3
conflict resolution
2018-09-01 12:38:22 +02:00
Laurent Destailleur
b863b5176d
Merge pull request #9322 from grandoc/new_branch_29_08_2018
...
New branch 29 08 2018
2018-09-01 12:11:01 +02:00
Laurent Destailleur
482ddd548a
Merge pull request #9332 from frederic34/functionClosingBrace
...
PSR2 FunctionClosingBrace
2018-09-01 12:06:08 +02:00
Frédéric FRANCE
9454f897ef
doxygen fix
2018-09-01 09:40:50 +02:00
Philippe GRAND
9e880d3e72
Standardize and update code
2018-08-31 17:55:31 +02:00
Laurent Destailleur
7b1a705be4
Clean duplicate code
2018-08-31 13:50:58 +02:00
Philippe Grand
b3c84ac3bc
Merge branch 'develop' into new_branch_29_08_2018
2018-08-30 12:09:40 +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
Frédéric FRANCE
5100b8b7b0
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-30 10:42:47 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration
2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace
2018-08-29 21:25:22 +02:00
Laurent Destailleur
489e766cbf
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/ticket/class/ticket.class.php
2018-08-29 20:24:01 +02:00
Laurent Destailleur
3ebfb23407
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/product/fournisseurs.php
htdocs/ticket/class/ticket.class.php
2018-08-29 20:22:50 +02:00
Laurent Destailleur
8b291b2053
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
README.md
2018-08-29 19:55:10 +02:00
Laurent Destailleur
0c11007e34
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
README.md
htdocs/comm/propal/card.php
2018-08-29 18:53:39 +02:00
Frédéric FRANCE
cbdc669ba9
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-29 18:45:36 +02:00
Frédéric FRANCE
0e512cbc36
Merge remote-tracking branch 'upstream/develop' into trimtrailing2
2018-08-29 15:47:55 +02:00
Laurent Destailleur
ee204e2e64
Fix regression in php style
2018-08-29 15:37:35 +02:00
Frédéric FRANCE
7b2bfb28c2
Merge remote-tracking branch 'upstream/develop' into trimtrailing2
2018-08-29 12:48:12 +02:00
Philippe Grand
0ab593fdb1
Merge branch 'develop' into new_branch_29_08_2018
2018-08-29 12:47:01 +02:00
Laurent Destailleur
b648a28893
Fix regression
2018-08-29 11:57:43 +02:00
Frédéric FRANCE
846778657f
fix syntax error
2018-08-29 11:44:26 +02:00
Philippe GRAND
5b0425706c
try to fix space errors
2018-08-29 11:39:38 +02:00
Philippe GRAND
84a9ca3f68
fix : Parse error: ./htdocs/comm/mailing/cibles.php:644
2018-08-29 10:40:30 +02:00
gauthier
61a57e619f
FIX : $fk_account is always empty, must be $soc->fk_account
2018-08-28 16:54:04 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-28 09:34:53 +02:00
Frédéric FRANCE
1182f29864
trimtrailing
2018-08-28 08:33:02 +02:00
Laurent Destailleur
2349f99eb9
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-08-28 02:58:51 +02:00
Laurent Destailleur
50d50c2e10
Merge pull request #9307 from ATM-Marc/FIX_6.0_thirdparty_info
...
NEW On customer/supplier card, add simple tooltip to amount boxes
2018-08-28 02:48:05 +02:00
Laurent Destailleur
9c6ce4b29d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-28 02:36:15 +02:00
Laurent Destailleur
9a14611d55
Merge pull request #8996 from grandoc/new_branch_20_06_2018
...
clean and update code
2018-08-28 02:35:59 +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
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing
...
Trimtrailing
2018-08-28 02:30:02 +02:00
Laurent Destailleur
32ef9695a7
Merge pull request #9282 from frederic34/patch-19
...
Update card.php
2018-08-28 02:28:35 +02:00
Laurent Destailleur
7462a1ae1d
Update card.php
2018-08-28 02:27:56 +02:00
Laurent Destailleur
2306f8a7c2
Merge pull request #9265 from grandoc/new_branch_18_08_2018
...
Typo
2018-08-28 02:25:24 +02:00
Laurent Destailleur
0a7ce338f9
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/commondocgenerator.class.php
2018-08-28 02:23:34 +02:00
Laurent Destailleur
d90eed3098
Merge pull request #9291 from frederic34/patch-23
...
typo
2018-08-28 01:55:44 +02:00
Laurent Destailleur
534eadb7a2
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-08-28 01:35:43 +02:00
Marc de Lima Lucio
d09f9b2543
FIX: customer/supplier card: add simple tooltip to amount boxes
2018-08-27 18:19:42 +02:00
atm-ph
d9beb3f882
Fix tms missing in fetch propal
2018-08-27 10:19:07 +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
Frédéric FRANCE
85ae8f3901
Update card.php
2018-08-24 09:29:17 +02:00
Philippe GRAND
2fa82edd39
Standardize and update code
2018-08-23 17:07:27 +02:00
Frédéric FRANCE
343e6ce8b3
typo
2018-08-23 14:34:27 +02:00
Philippe Grand
f98d2078e2
Merge branch 'develop' into new_branch_20_06_2018
2018-08-23 10:41:34 +02:00
Philippe Grand
9b2e754b46
Update advtargetemailing.class.php
2018-08-22 22:41:22 +02:00
Philippe Grand
eeaa257f11
Update cactioncomm.class.php
2018-08-22 22:39:51 +02:00
Philippe Grand
c626dcb710
Update actioncomm.class.php
2018-08-22 22:38:00 +02:00
Philippe GRAND
449ef9c464
Update and standardize code
2018-08-22 18:12:44 +02:00
Frédéric FRANCE
0334409d18
Update card.php
2018-08-22 13:43:30 +02:00
Philippe GRAND
6542dcf0bd
Update and standardize code
2018-08-22 12:04:50 +02:00
Philippe GRAND
e0462b975b
Update and standardize code
2018-08-22 11:48:26 +02:00
Philippe GRAND
95349365ba
Update and standardize code
2018-08-22 11:39:37 +02:00
Philippe GRAND
0ffad50974
Update and standardize code
2018-08-22 11:24:31 +02:00
Philippe GRAND
29f15b4ae6
Update and standardize code
2018-08-22 10:51:55 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-21 20:57:58 +02:00
Frédéric FRANCE
0fbccce9a7
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-21 19:59:07 +02:00
Laurent Destailleur
db3c17668e
Fix coding style
2018-08-21 19:08:11 +02:00
Frédéric FRANCE
aba69b94b2
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-21 14:03:02 +02:00
Laurent Destailleur
0799970804
Merge pull request #9248 from frederic34/FunctionDeclaration
...
function declaration
2018-08-21 13:41:56 +02:00
Laurent Destailleur
85eed6cf80
Merge branch 'develop' into trimtrailing
2018-08-21 13:40:04 +02:00
Laurent Destailleur
289f194641
Merge pull request #9058 from defrance/patch-123
...
New : Add total price on dashboard
2018-08-21 13:33:33 +02:00
Laurent Destailleur
5e09d5160f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-21 13:17:20 +02:00
Laurent Destailleur
0f1e5a78c6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-21 13:17:11 +02:00
Philippe Grand
ccdae4c597
Update html.formadvtargetemailing.class.php
2018-08-18 19:15:25 +02:00
Philippe GRAND
c8c8af55a0
Typo
2018-08-18 15:56:23 +02:00
Philippe GRAND
da951e61f2
Update and standardize code
2018-08-17 22:29:21 +02:00
Philippe GRAND
c48211ad70
Update and standardize code
2018-08-17 19:31:22 +02:00
Frédéric FRANCE
71d3af8b07
Update propal.class.php
2018-08-17 13:44:07 +02:00
Laurent Destailleur
4e02b134da
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2018-08-16 14:50:04 +02:00
Laurent Destailleur
2719c4eb43
Fix escape
2018-08-16 01:01:38 +02:00
Laurent Destailleur
4b7889b295
Fix left join broken
2018-08-16 01:00:38 +02:00
Frédéric FRANCE
54a078149a
function declaration
2018-08-15 17:34:35 +02:00
Laurent Destailleur
5a1a6ac095
Fix error message
2018-08-15 14:42:03 +02:00
Frédéric FRANCE
7bb781eea8
function declaration
2018-08-15 14:28:34 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function
2018-08-13 17:26:32 +02:00
Frédéric FRANCE
82e8efe792
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 20:14:14 +02:00
Laurent Destailleur
9fc5d39d07
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:36 +02:00
Laurent Destailleur
dc8c4402ee
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:22 +02:00
Laurent Destailleur
0a1c6e7194
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/list.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
2018-08-12 20:08:20 +02:00
Frédéric FRANCE
6113b536a0
remove superfluous spaces
2018-08-12 19:59:39 +02:00
Laurent Destailleur
30b4d88428
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/product/reassort.php
htdocs/societe/list.php
2018-08-12 19:23:45 +02:00
Laurent Destailleur
61a5be6e2a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-08-12 19:19:21 +02:00
Laurent Destailleur
b81b6b651f
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-08-12 19:17:26 +02:00
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 18:21:59 +02:00
Laurent Destailleur
3d4d42462c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-08-12 16:30:21 +02:00
Laurent Destailleur
12e21b4886
FIX update extrafields
2018-08-12 16:29:26 +02:00
Laurent Destailleur
9b50bc2197
Fix css
2018-08-09 19:29:48 +02:00
Laurent Destailleur
61d7629ab1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
2018-08-08 17:44:22 +02:00
Juanjo Menent
ca7666793b
Merge pull request #9213 from fmarcet/develop
...
New: Sales representative column on Propal List
2018-08-08 11:11:20 +02:00
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-07 16:40:03 +02:00
Philippe GRAND
68de0ba93b
clean and update code
2018-08-07 10:56:59 +02:00
Ferran Marcet
c74ffade7d
New: Sales representative column on Propal List
2018-08-07 10:05:50 +02:00
Philippe GRAND
948647f3f9
comment translation
2018-08-04 14:17:51 +02:00
Laurent Destailleur
b01f07efda
Merge branch 'develop' into FIX_project_overview
2018-08-02 18:43:55 +02:00
Juanjo Menent
b8efe3b239
Merge pull request #9172 from grandoc/new_branch_28_07_2018
...
standardize
2018-08-02 11:27:02 +02:00
Juanjo Menent
37a9a2df56
Merge pull request #9167 from frederic34/include
...
Include and co are statements
2018-08-02 11:03:44 +02:00
Philippe GRAND
d1f100b0c9
standardize
2018-07-29 17:17:29 +02:00
Philippe GRAND
de70bf983e
standardize
2018-07-29 13:40:35 +02:00
Laurent Destailleur
7af42c66cc
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/list.php
2018-07-27 12:54:45 +02:00
Frédéric FRANCE
b90d125fda
trim trailing
2018-07-26 20:19:52 +02:00
Frédéric FRANCE
a0a5d33641
test include
2018-07-26 17:30:53 +02:00
Frédéric FRANCE
2dd907a8e1
extrafield totalizable
2018-07-26 09:41:44 +02:00
Laurent Destailleur
e024ea9c05
Merge pull request #9146 from grandoc/new_branch_24_07_2018
...
Clean and update code
2018-07-24 21:41:12 +02:00
Philippe
d7f58d0087
FIX search on ref project on propal list
2018-07-24 20:28:49 +02:00
Laurent Destailleur
dc2fec8f57
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-24 19:37:04 +02:00
Laurent Destailleur
d871b8964f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-07-24 19:23:40 +02:00
Laurent Destailleur
20f178fdfe
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/comm/action/index.php
htdocs/core/lib/functions.lib.php
2018-07-24 19:22:00 +02:00
Philippe GRAND
2a6f050e32
Clean and update code
2018-07-24 18:28:56 +02:00
Philippe GRAND
442ffb95ba
clean and update code
2018-07-23 17:57:11 +02:00
Laurent Destailleur
19bb8a5091
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/accountancy.lang
2018-07-18 14:12:28 +02:00
Laurent Destailleur
4beca8d989
Fix restore look and feel
2018-07-18 13:00:38 +02:00
Philippe Grand
e913d854d0
Fix PR
2018-07-16 11:00:39 +02:00
Laurent Destailleur
387abf2da8
Merge pull request #9057 from inoveaconseil/checkRightOnLink
...
ADD Check right on link
2018-07-16 09:31:21 +02:00
Laurent Destailleur
d968a61445
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-15 20:17:17 +02:00
Laurent Destailleur
f3b7bc53bd
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/tpl/extrafields_list_print_fields.tpl.php
2018-07-15 20:16:08 +02:00
gauthier
80ff7fa86f
FIX : case when we valid form with keyboard
2018-07-11 15:18:30 +02:00
gauthier
103c7e6d06
FIX : page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied)
2018-07-11 09:51:36 +02:00
Laurent Destailleur
c0d6aee040
Update propal.class.php
2018-07-10 11:10:01 +02:00
Laurent Destailleur
ed3023f7d9
Update propal.class.php
2018-07-10 11:09:08 +02:00
Laurent Destailleur
dc7fcc009b
Update propal.class.php
2018-07-10 10:56:45 +02:00
Marc de Lima Lucio
2ba7c07574
FIX: propal: correctly preset project when creating with origin/originid
2018-07-09 17:34:31 +02:00
John BOTELLA
1daba56bbc
Fix count(): Parameter must be an array or an object that implements Countable
2018-07-09 10:05:53 +02:00
BENKE Charlene
bfe7cd0d9f
Update propal.class.php
2018-07-05 12:11:20 +02:00
Inovea Conseil
30cff2bb36
ADD check user's rights
2018-07-05 11:52:41 +02:00
Laurent Destailleur
12c43d7722
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-03 12:33:17 +02:00
Laurent Destailleur
4e7f9b1b4d
Merge pull request #9038 from hregis/8.0_multicompany
...
Fix: possibility to overload permissions (multicompany sharing)
2018-07-02 16:12:40 +02:00
Laurent Destailleur
7c5aa148d9
Fix fetch
2018-07-02 15:26:01 +02:00
Regis Houssin
26495fb698
Fix: !!!! Dont't use entity if you use rowid in fetch or others !!!!
2018-07-01 18:49:37 +02:00
Regis Houssin
05c666c18b
Fix: use numbering model corresponding to the entity of the object
2018-07-01 17:06:19 +02:00
Regis Houssin
df55bee8ae
Fix: missing "$disableremove" global
2018-07-01 15:33:10 +02:00
Regis Houssin
c0c8a70dd5
Fix: permissions
2018-07-01 12:21:51 +02:00
Regis Houssin
d699667722
Fix: possibility to overload permissions (multicompany sharing)
2018-07-01 11:06:47 +02:00
Laurent Destailleur
982a1ffbaf
NEW Automatic position of scroll when creating an extrafield
2018-06-30 14:22:05 +02:00
Regis Houssin
4925624ed9
Fix: avoid NULL value when "subprice" is 0
2018-06-30 10:38:30 +02:00
Laurent Destailleur
8693775fc5
Fix phpunit
2018-06-24 18:15:49 +02:00
Laurent Destailleur
459fe7189d
Fix phpunit
2018-06-24 17:55:03 +02:00
Laurent Destailleur
af9d2c3b5a
Merge pull request #9008 from grandoc/new_branch_22_06_2018
...
clean and update code
2018-06-24 13:47:26 +02:00
Laurent Destailleur
5819333b80
Css
2018-06-24 11:30:44 +02:00
Philippe Grand
21ca374c27
Update cibles.php
...
Fixes
2018-06-24 10:57:53 +02:00
Philippe Grand
b528368a8b
Update cibles.php
2018-06-24 10:56:06 +02:00
Laurent Destailleur
5829014218
Merge branch 'develop' into NEW_advance_targer_filter_everywhere
2018-06-24 10:24:26 +02:00
Laurent Destailleur
27a27e02a1
Fix css
2018-06-22 22:53:53 +02:00
Philippe GRAND
afda5288a8
clean and update code
2018-06-22 16:27:11 +02:00
atm-quentin
d53aa71673
NEW advance target filtering can be used everywhere with tpl and fk_element
2018-06-22 10:54:00 +02:00
Philippe GRAND
4f554ab52a
clean and update code
2018-06-20 12:09:47 +02:00
Laurent Destailleur
d81398e72d
Fix info on tooltip
2018-06-18 16:27:25 +02:00
Inovea Conseil
d5a3e63e05
Fix missing paramater for generateDocument
2018-06-15 09:47:28 +02:00
Laurent Destailleur
910652eb6d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/langs/en_US/admin.lang
2018-06-13 23:07:30 +02:00
Laurent Destailleur
4c2af6fc70
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/html.form.class.php
2018-06-13 23:04:08 +02:00
Laurent Destailleur
4a5fd35e11
Look and feel v8
2018-06-13 22:57:41 +02:00
altatof
d42f00bca9
FIX : pu_ht_devise was not converted to numeric so decimals were lost
...
when clculating total_ht_devise
2018-06-13 16:35:52 +02:00
Laurent Destailleur
8aa7956b4f
Fix missing extraparams field in insert action
2018-06-07 12:53:06 +02:00
Laurent Destailleur
7a8fac4198
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/list.php
2018-06-04 15:14:26 +02:00
Laurent Destailleur
de2ffa1122
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/comm/action/listactions.php
2018-06-04 14:09:17 +02:00
Laurent Destailleur
29ee5dffc4
Clean code
2018-06-04 12:55:55 +02:00
florian HENRY
b996237142
fix: when agenda is filterd with "todo" event, do not display "not
...
applicable" event
2018-05-30 13:37:17 +02:00
Laurent Destailleur
323bf6ef1f
Merge pull request #8873 from frederic34/loadlangs
...
loadlangs
2018-05-29 10:07:10 +02:00
Laurent Destailleur
f83dedf1b0
Fix space/tab
2018-05-29 10:04:20 +02:00
Neil Orley
748be12da2
Get external contacts ids instead of BILLING contacts ids.
2018-05-28 09:42:24 +02:00
Neil Orley
4ad1f81ea9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2018-05-28 09:30:21 +02:00
Frédéric FRANCE
d986909109
loadlangs
2018-05-26 23:52:52 +02:00
Frédéric FRANCE
30a3b95368
loadlangs
2018-05-26 20:32:23 +02:00
Frédéric FRANCE
f24a6ed4d6
loadlangs
2018-05-26 19:03:41 +02:00
Laurent Destailleur
182abfdb5b
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/societe/card.php
2018-05-25 15:02:24 +02:00
Laurent Destailleur
943d1dce2e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-05-25 13:15:38 +02:00
Laurent Destailleur
8a64ee2297
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/commande/list.php
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/expedition/class/expedition.class.php
htdocs/expedition/list.php
htdocs/societe/card.php
2018-05-25 13:14:58 +02:00
Laurent Destailleur
823936ef87
Merge pull request #8847 from frederic34/multipriceqty
...
NEW Finish implementation of option PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
2018-05-25 12:55:02 +02:00
Laurent Destailleur
7f77f1bd5a
Merge pull request #8825 from atm-florian/develop_advtrgtml
...
new : add adv targt emailing amdin with main feature level 1
2018-05-25 11:10:51 +02:00
Laurent Destailleur
973384604e
Merge pull request #8850 from grandoc/new_branch_24_05_2018
...
clean and update code
2018-05-25 10:45:39 +02:00
Günter Lukas
3adfce35e2
Update card.php
2018-05-24 13:32:13 +02:00
Günter Lukas
1b237a75b9
Update card.php
2018-05-24 13:31:23 +02:00
Laurent Destailleur
e51aa68284
Fix link to warehouses for events
2018-05-24 12:16:04 +02:00
Philippe GRAND
11b63325bf
clean and update code
2018-05-24 10:48:03 +02:00
atm-quentin
eb224e43a5
FIX missing filters during ordering
2018-05-24 10:41:24 +02:00
Frédéric FRANCE
8547827575
Merge remote-tracking branch 'upstream/develop' into multipriceqty
2018-05-23 17:06:02 +02:00
Frédéric FRANCE
efbb053e54
PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
2018-05-23 17:05:08 +02:00
Neil Orley
15e02c7082
NEW : adds billing contacts ids to REST API returns
...
adds billing contacts ids to REST API returns for proposals, orders and invoices
2018-05-22 11:40:32 +02:00
florian HENRY
22cdbffb0a
new : add adv targt emailing amdin with main feature level 1
2018-05-21 10:58:16 +02:00
Laurent Destailleur
c9d23d3930
Merge pull request #8783 from grandoc/new_branch_12_05_2018
...
Clean and update code
2018-05-18 08:56:06 +02:00
Laurent Destailleur
689ef37d56
Merge pull request #8781 from atm-john/extend_import_lines_from_linked_element
...
Add propals lines inport on invoices.
2018-05-18 08:55:29 +02:00
Laurent Destailleur
67ed1e0841
Fix filter criteria when using backto for events
2018-05-16 20:59:45 +02:00
Laurent Destailleur
133e736801
Fix save code
2018-05-16 20:52:45 +02:00
Laurent Destailleur
ef395fc36b
Fix scrutinizer bugs
2018-05-16 15:23:52 +02:00
Laurent Destailleur
63ed5dcccc
Fix securekey for new online payment form
2018-05-12 11:23:40 +02:00
Philippe GRAND
29c735d8bd
Clean and update code
2018-05-12 10:46:17 +02:00
atm-john
6b2dfa0528
Extend lines import to propal
2018-05-10 21:06:18 +02:00
Ferran Marcet
70527e64c5
New: Add Date delivery and Availability on Propals List
2018-05-08 18:15:02 +02:00
atm-quentin
8cd6c72a2f
NEW advanced rights
2018-05-07 10:04:43 +02:00
Laurent Destailleur
86697c58d8
Merge pull request #8712 from atm-quentin/develop_categ_filter
...
NEW thirdparty categ filter on lists
2018-05-05 12:56:27 +02:00
atm-quentin
ec5e84075e
NEW Rights to ignore price min
2018-05-03 10:18:38 +02:00
atm-quentin
21b387a4c4
NEW thirdparty categ filter on lists
2018-05-02 15:01:32 +02:00
ATM-Nicolas
73c3529831
NEW : Display price HT on all commercial area boards
2018-05-02 14:36:55 +02:00
Laurent Destailleur
3374c50e2d
CSS
2018-05-01 10:42:09 +02:00
Laurent Destailleur
32ace6a8cf
NEW Add hook setContentSecurityPolicy
2018-04-30 15:17:38 +02:00
Laurent Destailleur
82a8513aed
Standardize code
2018-04-29 19:52:14 +02:00
Regis Houssin
2906358383
Fix: use "socpeople" instead "societe"
2018-04-27 10:42:10 +02:00
Laurent Destailleur
461ae46cc4
FIX When on a high page and searching for a small result, list was not
...
visible.
2018-04-24 11:37:57 +02:00
Laurent Destailleur
69adf73f4f
Clean code from $var = True
2018-04-22 19:27:37 +02:00
Laurent Destailleur
46e448a086
Fix default agenda view
2018-04-22 17:57:20 +02:00
Laurent Destailleur
912d5c53f2
Standardize code
2018-04-21 15:54:05 +02:00
Laurent Destailleur
411949a6bb
Optimize constructors
2018-04-21 15:08:46 +02:00
Laurent Destailleur
394b988a4e
FIX key in getEntity for supplier proposals
2018-04-21 14:41:31 +02:00
Laurent Destailleur
c81c744aaf
Clean deprecated var
2018-04-21 13:14:58 +02:00
Laurent Destailleur
ccd9aa8059
Fight against dolibarr warnings
2018-04-21 12:16:12 +02:00
Laurent Destailleur
38d200d8a6
Fix left menu
2018-04-20 13:23:34 +02:00
Laurent Destailleur
bbfc4a3e17
NEW Look and feel v8 - Show Picto "+" on all links "Add record"
2018-04-18 03:26:15 +02:00
Laurent Destailleur
0d0da234b1
Lowercase NULL, TRUE, FALSE according to PSR2
2018-04-16 13:51:16 +02:00
Laurent Destailleur
8fbde88872
Look and feel v8
2018-04-15 17:37:49 +02:00
florian HENRY
ad403c7045
fix syntax and uniformize code
2018-04-14 17:04:38 +02:00
Laurent Destailleur
86112f0096
Syntax error
2018-04-13 14:15:33 +02:00
Laurent Destailleur
d4cd5a0d95
Fix syntax error
2018-04-13 13:37:43 +02:00
Laurent Destailleur
be965bdbab
Clean code
2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b
Clean code
2018-04-13 11:03:03 +02:00
All-3kcis
880fa55dd5
display user-friendly filesize
2018-04-12 15:29:22 +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
4d94327ead
Look and feel v8
2018-04-07 16:17:40 +02:00
Laurent Destailleur
d46a8eb8f0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/company.php
2018-04-07 12:30:30 +02:00
Laurent Destailleur
ee870342ef
Fix navigation/translation
2018-04-06 20:22:20 +02:00
Laurent Destailleur
1009a629d9
Try better Fix for #8432
2018-04-06 13:20:09 +02:00
Laurent Destailleur
2207e5e470
Fix tooltip
2018-04-05 19:23:36 +02:00
Laurent Destailleur
2d547abaa9
Merge pull request #8498 from atm-john/New_import_lines_from_linked_element
...
New import lines from linked element
2018-04-05 18:26:47 +02:00
Laurent Destailleur
9d9f3ddf85
Merge pull request #8502 from ATM-Marc/NEW_create_from_list
...
NEW: generalize use of button to create new element from list
2018-04-05 16:40:15 +02:00
Marc de Lima Lucio
c2d3e2a701
NEW: generalize button to create object from list, for the remaining lists
2018-04-03 15:28:12 +02:00
John
d689e88b92
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element
2018-04-03 11:38:12 +02:00
Laurent Destailleur
43f8834b28
Uniformize code with the new module builder framework
2018-03-31 18:48:27 +02:00
Marc de Lima Lucio
0366e645d5
NEW: generalize button to create object from list, for most of the lists
2018-03-30 16:54:38 +02:00
Laurent Destailleur
b6e9e0e287
Fix missing hooks
2018-03-30 16:44:58 +02:00
Laurent Destailleur
6ccdb52229
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-29 13:30:22 +02:00
Laurent Destailleur
072b6c02c0
FIX Test on mandatory status when closing proposal failed
2018-03-29 13:25:03 +02:00
Laurent Destailleur
b806b85761
Fix field filtert is set twice
2018-03-29 11:15:50 +02:00
Laurent Destailleur
6ef1dbbe0f
FIX auto open contract if one result found
2018-03-24 18:28:06 +01:00
Laurent Destailleur
630ed04e17
FIX missing properties in last contract list
2018-03-24 13:15:00 +01:00
Laurent Destailleur
6e52c896f2
Dolibarrize module ticket
2018-03-22 10:46:42 +01:00
Laurent Destailleur
d4ae0395ed
NEW Look and feel v8: Use a different picto for delete and unlink
2018-03-18 19:13:42 +01:00
Laurent Destailleur
e639f2a91f
Removed deprecated method classer_facturee(). Duplicate of
...
classifyBilled
2018-03-16 10:51:12 +01:00
Laurent Destailleur
c962b89495
NEW hook getnomurltooltip is replaced with hook getNomUrl more powerfull
2018-03-15 20:46:55 +01:00
Laurent Destailleur
620ceb54e3
Clean code to avoid confusion
2018-03-15 14:25:09 +01:00
Laurent Destailleur
0258d3aeeb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-13 18:04:59 +01:00
ptibogxiv
4f6f0b302e
FIX for nondisplay of fk_element 's id in REST API response
...
the fk_element don't display when the call is made with REST API (reason non found)
2018-03-13 10:28:44 +01:00
Laurent Destailleur
78b0585798
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/taxes.php
2018-03-12 19:09:57 +01:00
Laurent Destailleur
93f4d6fdcd
Translation
2018-03-11 21:34:38 +01:00
Laurent Destailleur
a3d25b24d3
FIX #8285 Extrafields now reported by /api/index.php/agendaevents/{id}
2018-03-11 19:27:03 +01:00
Laurent Destailleur
4070d78d13
Fix phpcs
2018-03-11 02:18:46 +01:00
Laurent Destailleur
7f469e9f6f
Fix PHPCS
2018-03-11 02:04:08 +01:00
Alexis Algoud
129c032118
NEW hidden conf to set nb weeks to show into user view
2018-03-10 16:46:57 +01:00
Laurent Destailleur
466f87ee15
Merge pull request #8322 from inoveaconseil/develop
...
Add research with phone number on left search
2018-03-10 11:20:16 +01:00
Inovea Conseil
9075ed4107
Add mass action proposal closed
2018-03-10 00:04:58 +01:00
Laurent Destailleur
20ec269d4d
Merge pull request #8318 from atm-florian/7.0_betterthirdpartylink
...
7.0 betterthirdpartylink
2018-03-09 23:03:23 +01:00
florian HENRY
a34709c112
fix better thirdparty link
2018-03-09 22:36:00 +01:00
Regis Houssin
ea175cd6c1
Fix: compatibility with multicompany dictionnary sharing
2018-03-09 09:37:23 +01:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm
...
NEW: supplier credit notes & discounts (absolute and relative)
2018-03-08 20:06:37 +01:00
Regis Houssin
93a9430e49
Fix: regression, restore primary key
2018-03-08 07:41:54 +01:00
Laurent Destailleur
7e3b118257
Standardize output
2018-03-07 12:03:40 +01:00
Laurent Destailleur
1ca5c7083a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2018-03-07 11:54:48 +01:00
Laurent Destailleur
f800d50fec
WIP to show event per hours
2018-03-07 11:53:30 +01:00
Laurent Destailleur
a0a9e12178
Fix css
2018-03-07 11:29:50 +01:00
Laurent Destailleur
1a5cc4e516
Fix in edit mode, title of event is required
2018-03-07 11:06:14 +01:00
Laurent Destailleur
f3fd5f4cfa
FIX Label of event show twice
2018-03-07 11:03:35 +01:00
Laurent Destailleur
1e6a55745c
CSS
2018-03-06 11:54:05 +01:00
Marc de Lima Lucio
1765b09fda
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-05 11:05:38 +01:00
Marc de Lima Lucio
6a4a3c9e82
NEW: supplier credit notes: remove MAIN_FEATURES_LEVEL
2018-03-05 10:58:19 +01:00
Laurent Destailleur
864edce665
NEW Accept anonmymous events (no user assigned)
...
NEW Online payment now record the payment on invoices
2018-03-04 19:39:46 +01:00
Laurent Destailleur
0270e21289
Merge pull request #8242 from hregis/develop_multicompany
...
Fix: use "multidir_output" instead "dir_output" (propal)
2018-03-02 17:49:25 +01:00
Marc de Lima Lucio
451d943927
NEW: supplier credit notes: factorized discount block (+ correct translations for supplier discounts)
2018-03-02 16:48:25 +01:00
Laurent Destailleur
191a1e9350
Fix css
2018-03-02 11:18:29 +01:00
Laurent Destailleur
a3350d12d8
css
2018-03-01 23:51:06 +01:00
Laurent Destailleur
0f237e4d5c
NEW Add mass action enable/disable on cron job list
2018-03-01 15:24:50 +01:00
Marc de Lima Lucio
059801fe03
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-01 10:22:21 +01:00
Laurent Destailleur
6f29a574cf
CSS
2018-03-01 02:37:18 +01:00
Laurent Destailleur
f545d2a134
NEW Can add filter actiontype and notactiontype on event ical export
2018-02-28 20:06:28 +01:00
Laurent Destailleur
c8e6a8c014
Fix look and feel v7
2018-02-27 22:17:42 +01:00
Laurent Destailleur
04934cc4aa
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/functions.lib.php
htdocs/projet/tasks/time.php
2018-02-27 19:18:43 +01:00
Marc de Lima Lucio
7cd1b2caa9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-02-27 16:45:01 +01:00
Marc de Lima Lucio
9cf45266f5
NEW: supplier relative discounts
2018-02-27 16:30:39 +01:00
Laurent Destailleur
0cc84ab92f
FIX Missing restore_lastsearch_values
2018-02-26 21:21:28 +01:00
Laurent Destailleur
3c552cec15
FIX Missing restore_lastsearch_values
2018-02-26 21:16:40 +01:00
Marc de Lima Lucio
7ca5ac03cc
FIX: discount card: only display relevant discounts types (customer/supplier)
2018-02-26 17:40:31 +01:00
Regis Houssin
093ea49cc6
Fix: use "multidir_output" instead "dir_output"
2018-02-26 11:35:30 +01:00
Laurent Destailleur
41638e6dff
Fix back link of look and feel v7
2018-02-26 09:20:05 +01:00
Laurent Destailleur
003827eb06
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-25 15:01:19 +01:00
Laurent Destailleur
502f219f7f
Merge pull request #8231 from hregis/7.0_entity
...
FIX missing object entity in fetch
2018-02-25 12:59:38 +01:00
Regis Houssin
703d976b3b
Fix: missing object entity in fetch
2018-02-24 16:21:16 +01:00
Regis Houssin
b216249214
Fix: missing hook parameters
2018-02-24 15:01:29 +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
John
bd0e8506f5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element
2018-02-21 11:53:16 +01:00
Laurent Destailleur
72c1357c9b
NEW Section of files generated by mass action not visible if empty
2018-02-21 11:02:45 +01:00
Laurent Destailleur
c4130730cb
Clean code around fetch_optionals()
2018-02-20 19:38:18 +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
John
09c5dc506a
Add html dom element and fix class
2018-02-20 17:46:32 +01:00
John
5624257a6d
add new dom html5 elements and class
2018-02-20 16:49:49 +01:00
Marc de Lima Lucio
95be155010
FIX: supplier credit notes: harmonize discount filters
2018-02-20 12:26:29 +01:00
Marc de Lima Lucio
f5ad93b272
NEW: supplier credit notes: handle Excess Paid + translation
2018-02-19 15:52:07 +01:00
Marc de Lima Lucio
fa0c65e37e
FIX: supplier credit notes: correctly handle discount split
2018-02-16 12:05:36 +01:00
Marc de Lima Lucio
e2b65b3755
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note
2018-02-16 09:14:53 +01:00
Laurent Destailleur
6b74c79798
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-02-15 15:34:17 +01:00
Laurent Destailleur
f0855da0fb
Fix responsive
2018-02-15 12:57:04 +01:00
Laurent Destailleur
78697c1735
USe fk_product is better than ref
2018-02-14 21:14:24 +01:00
Marc de Lima Lucio
daca27b2ed
NEW: supplier credit notes: split display in thirdparty discount page + fixes + refactoring
2018-02-14 18:02:40 +01:00
Laurent Destailleur
109c447171
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-12 03:21:37 +01:00
Romain DESCHAMPS
8e42ed5824
add missing links in cust. card boxes
2018-02-12 02:40:13 +01:00
Laurent Destailleur
eccdc9a075
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/langs/pt_PT/companies.lang
2018-02-08 15:20:24 +01:00
Laurent Destailleur
9c954de081
Error management
2018-02-08 14:25:44 +01:00
Laurent Destailleur
475b89bac1
Merge branch 'develop' into new_order_min_amount
2018-02-08 14:20:53 +01:00
Laurent Destailleur
b364b2a4de
Fix selection of filter in agenda views
2018-02-06 01:16:51 +01:00
Laurent Destailleur
074f4a3b46
Fix class not found when selecting project ref in lists
2018-02-06 00:34:14 +01:00
Laurent Destailleur
b063c19084
Fix: object project not defined
2018-02-06 00:19:40 +01:00
Laurent Destailleur
2fbe4637ac
Fix bad filter link
2018-02-05 23:05:37 +01:00
Laurent Destailleur
0cc6654b06
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2018-02-04 13:25:00 +01:00
Laurent Destailleur
0e3d5ea9e5
Fix missing translation
2018-02-04 11:44:39 +01:00
Laurent Destailleur
b3df7670e9
Merge pull request #7999 from frederic34/propalweight
...
NEW display weight volume in propal
2018-02-03 16:58:58 +01:00
Laurent Destailleur
f51d6a2e50
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-02 10:07:16 +01:00
Laurent Destailleur
9c6b6f244c
Fix tooltip on invoice
2018-02-01 01:25:45 +01:00
Laurent Destailleur
7f9d6a5458
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/paybox/newpayment.php
htdocs/public/payment/newpayment.php
htdocs/public/paypal/newpayment.php
htdocs/public/stripe/newpayment.php
2018-01-31 20:25:24 +01:00
Laurent Destailleur
de0a8ba71f
Fix extrafields
2018-01-31 14:01:58 +01:00
Laurent Destailleur
d6317a26d2
Fix for multicompany
2018-01-30 15:48:09 +01:00
Laurent Destailleur
c67e57836e
Code comment
2018-01-29 12:58:33 +01:00
Laurent Destailleur
0a11d52d53
Fix info on email sent
2018-01-29 12:46:07 +01:00
Laurent Destailleur
f2a3c83053
Better error messages
2018-01-27 18:46:52 +01:00
Laurent Destailleur
ba0a96c882
Missing param limit
2018-01-26 15:37:23 +01:00
Laurent Destailleur
c5307e5cac
Fix option MAILING_LIMIT_SENDBYWEB
2018-01-26 15:12:40 +01:00
Maxime Kohlhaas
6f248a6590
New allow to define order min amount
2018-01-20 20:17:56 +01:00
Laurent Destailleur
fd6f0a4494
Fix use constant for status
2018-01-20 13:03:18 +01:00
Jan Giebels
d01a8d0508
Added order status =1 or =2 for overview
2018-01-19 11:22:25 +01:00
Laurent Destailleur
59eefa46e6
Fix duplicate search field
2018-01-16 18:02:36 +01:00
Laurent Destailleur
1f2d275ef2
Fix conditions of some fields
2018-01-13 17:21:56 +01:00
Laurent Destailleur
53b36435d0
Fix on smartphone
2018-01-12 20:50:18 +01:00
Laurent Destailleur
a44363ce3d
Fix responsive
2018-01-12 14:41:57 +01:00
Laurent Destailleur
43d560830c
Fix on old php
2018-01-10 13:20:43 +01:00
Laurent Destailleur
9f79ad800b
Fix price per quantity
2018-01-09 14:20:47 +01:00
Laurent Destailleur
42e659e26c
Fix link for online payment
2018-01-08 13:21:04 +01:00
Laurent Destailleur
1e438b7ebd
Fix travis and return of api that change status
2018-01-05 02:01:57 +01:00
Laurent Destailleur
d7837f8800
Try fix for #7778
2018-01-05 01:43:51 +01:00
Laurent Destailleur
45ed5c20ea
Merge pull request #8011 from frederic34/patch-1
...
Update card.php
2018-01-04 23:57:53 +01:00
Laurent Destailleur
dd8e7d657f
Update card.php
2018-01-04 23:57:45 +01:00
Laurent Destailleur
f19fb90ab0
Merge #8008 manually
2018-01-04 23:36:14 +01:00
Laurent Destailleur
f6007045f5
Fix search filters
2018-01-04 00:23:08 +01:00
Laurent Destailleur
6bc8268dc5
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-01-03 23:35:15 +01:00
Frédéric FRANCE
aaff13a984
Update card.php
2018-01-02 14:28:52 +01:00
Frédéric FRANCE
33f6ba19da
display weight volume in propal
2017-12-28 16:20:08 +01:00
Laurent Destailleur
77be56ff74
Merge pull request #7991 from defrance/patch-103
...
Add project column on proposal list
2017-12-28 13:03:03 +01:00
Laurent Destailleur
af8ebc616b
Update list.php
2017-12-28 13:02:26 +01:00
Laurent Destailleur
9ac99caffe
Merge pull request #7995 from frederic34/patch-1
...
Update propal.class.php
2017-12-28 12:51:44 +01:00
Laurent Destailleur
b0fefffcf8
Fix standardize api code
2017-12-28 12:44:15 +01:00
Laurent Destailleur
6676178435
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/list.php
htdocs/contrat/card.php
2017-12-28 09:56:40 +01:00
Laurent Destailleur
3ac413084f
Merge branch '6.0' into 6.0
2017-12-28 08:46:22 +01:00
Frédéric FRANCE
80618d56ac
Update propal.class.php
2017-12-26 16:12:28 +01:00
Ferran Marcet
1c7b99d3dc
Fix: Missing include for Project class
2017-12-26 12:13:35 +01:00
BENKE Charlene
df884e4080
Add project column on proposal list
...
if project are not enabled we don't display it
2017-12-23 18:37:08 +01:00
Laurent Destailleur
aad0da2513
Fix maxi debug of APIs (clean output fields)
2017-12-21 16:50:18 +01:00
Laurent Destailleur
eab44f62b1
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_builddoc.inc.php
htdocs/core/class/html.form.class.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
htdocs/core/tpl/admin_extrafields_edit.tpl.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/notes.tpl.php
htdocs/main.inc.php
htdocs/product/inventory/tpl/inventory.tpl.php
htdocs/societe/tpl/linesalesrepresentative.tpl.php
2017-12-21 14:35:33 +01:00
Laurent Destailleur
6a62e13960
FIX security vulnerability reported by ADLab of Venustech
2017-12-21 13:32:16 +01:00
Laurent Destailleur
4a5988accb
FIX security vulnerability reported by ADLab of Venustech
2017-12-21 12:52:19 +01:00
Laurent Destailleur
b03d0134a7
Filter on date extrafield timestamp and datetime disabled (not possible
...
yet)
2017-12-20 18:30:41 +01:00
Laurent Destailleur
3635e88396
Update api_proposals.class.php
2017-12-19 18:01:38 +01:00
Neil Orley
e90183f4ba
NEW Update end of validity date of proposal using the API
...
Add the ability to update the end of validity date when modifying a proposal
2017-12-19 12:37:37 +01:00
Neil Orley
fe8fac9577
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api
2017-12-19 12:36:46 +01:00
Laurent Destailleur
1351a43a30
FIX Maxi debug of permission for users external or restricted to sales
...
representatives
2017-12-18 16:13:05 +01:00
Neil Orley
d8dac909d6
NEW Add error message
...
Returns the error message when the API can't add a new line in a proposal
2017-12-18 14:36:41 +01:00
Neil Orley
4c852d1b6f
NEW Set a proposal to draft
...
Set a proposal to draft
2017-12-15 16:34:30 +01:00
Laurent Destailleur
247c380d18
Several fixes
2017-12-12 16:11:40 +01:00
Laurent Destailleur
af1028576d
Fix on search all (trim search + search from smartphone).
2017-12-12 11:31:30 +01:00
Laurent Destailleur
1251807f54
Fix several pb in links to projects on create page
2017-12-12 10:37:51 +01:00
Laurent Destailleur
bb7c03906e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/societe/list.php
2017-12-11 15:25:09 +01:00
Laurent Destailleur
95cb5025a2
Fix length of month too large
...
More complete template
2017-12-08 16:15:41 +01:00
Laurent Destailleur
09d3db145b
Merge
2017-12-08 13:10:13 +01:00
Regis Houssin
1b16eb731d
Fix: missing load product translation file
2017-12-08 11:00:23 +01:00
Regis Houssin
1bdffa961f
Fix: wrong translation if multilang activated
2017-12-08 10:41:14 +01:00
Laurent Destailleur
50150cf897
Merge pull request #7918 from atm-maxime/develop
...
Fix scrutinizer
2017-12-08 10:35:24 +01:00
Maxime Kohlhaas
8a39e2a413
Fix : no need for action button on cards, link is now available
2017-12-07 00:36:23 +01:00
Maxime Kohlhaas
0fa77160d9
Fix scrutinizer
2017-12-06 23:21:58 +01:00
Laurent Destailleur
2e2ab54d19
Fix parameter in delete line
2017-12-03 20:51:26 +01:00
Laurent Destailleur
1f4a079f01
Fix bug reported by scrutinizers
2017-12-02 15:03:14 +01:00
Laurent Destailleur
e8327fd9a1
Fix the eatby/sellby date was not visible.
2017-12-02 10:43:01 +01:00
Laurent Destailleur
0a73daba01
Security: on target=_blank, we must have rel="noopener"
2017-12-02 03:04:52 +01:00
Laurent Destailleur
ce32da6217
Fix debugs APIs
2017-12-01 15:39:18 +01:00
Laurent Destailleur
670465fcd8
Fix responsive and search
2017-12-01 12:01:17 +01:00
Laurent Destailleur
c269dcc4d5
Fix scrutinizer
2017-11-29 17:58:13 +01:00
Laurent Destailleur
682afe8918
Fix scrutinizer
2017-11-29 16:25:12 +01:00
florian HENRY
94285ae494
factorization of extrafeild into list
2017-11-27 15:24:29 +01:00
Laurent Destailleur
0b9a3087ea
Fix bug reported by scrutinizer
2017-11-25 12:11:02 +01:00
Laurent Destailleur
944d666d1a
Fix bugs
2017-11-25 11:27:24 +01:00
Laurent Destailleur
4cff4c6935
Simplify and standardize code for agenda pages
2017-11-25 00:12:45 +01:00
Laurent Destailleur
c16a150a70
NEW Remove background on agenda view when event is a not busy event.
2017-11-24 20:02:46 +01:00
Laurent Destailleur
b052722cf1
Merge pull request #7861 from hregis/develop_member
...
Fix: wrong table name and id field name
2017-11-24 16:36:22 +01:00
Laurent Destailleur
9c22b5f335
Replace deprecated dol_print_graph with DolGraph
2017-11-23 20:24:05 +01:00
Laurent Destailleur
b93e35cdd2
Fix a lot of request to use the IN getentity instead of =
...
Fix a lot of request to use left join on type of payment table
2017-11-23 15:06:16 +01:00
Regis Houssin
2a7b04e795
Fix: wrong table name and id field name
2017-11-23 12:18:49 +01:00
Laurent Destailleur
5b77fe393e
Fix: contact not preselected
2017-11-23 00:59:43 +01:00
Laurent Destailleur
adce4b5b7b
Debug multi contact on event.
...
Prepare also code to manage properties of attendees of event
2017-11-22 14:42:47 +01:00
Laurent Destailleur
fd5cb736ce
Merge pull request #6961 from atm-ph/new_event_with_multi_contact
...
New multi contacts on actioncomm
2017-11-22 12:05:04 +01:00
Laurent Destailleur
46d1318a32
Merge pull request #7828 from papoteur-mga/develop
...
Fix:[proposals]Allow lines to be added from REST API
2017-11-22 11:16:32 +01:00
Laurent Destailleur
ff9a62e519
Fix trackid from emailings
2017-11-21 11:15:33 +01:00
Papoteur
dfffd7497e
Correction of the previous commit.
...
Place the convertion into object at the good place.
2017-11-19 11:46:34 +01:00
Papoteur
f3f182b5bc
[proposals]Allow lines to be added from REST API
...
Prevously, only void lines was added. Need to convert array lines to object in this case.
2017-11-18 16:21:54 +01:00
atm-ph
fbc761cbac
Fix rename TContactId into socpeopleassigned
2017-11-18 12:36:03 +01:00
atm-ph
15a8f2037b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
2017-11-18 11:54:21 +01:00
Laurent Destailleur
80bdb45be8
Look and feel v6 - Show status of thirdparty in dol_banner
2017-11-18 01:48:16 +01:00
Laurent Destailleur
481b810fd2
Merge pull request #7810 from frederic34/patch-1
...
fix trigger when module not enabled
2017-11-17 12:59:59 +01:00
Laurent Destailleur
4f25bc5e3b
NEW detection of edge browser
2017-11-16 14:44:55 +01:00
Frédéric FRANCE
0d79cc50b0
Merge remote-tracking branch 'upstream/develop' into patch-1
2017-11-16 13:41:24 +01:00
Laurent Destailleur
a7aa3ee438
Rename file
2017-11-16 12:21:21 +01:00
Laurent Destailleur
c527189088
Standardize page name
2017-11-16 12:18:25 +01:00
Laurent Destailleur
19d0283b63
Fix doxygen
2017-11-16 12:13:23 +01:00
Laurent Destailleur
f68b2bdeca
Use the confirmation when deleting from mass action everywhere.
2017-11-15 11:39:11 +01:00
Laurent Destailleur
c85acbfc11
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/install/repair.php
2017-11-14 19:47:33 +01:00
Laurent Destailleur
0e2f64af72
CSS
2017-11-14 12:18:02 +01:00
Laurent Destailleur
fa92c53ff6
Fix pb when showing dictionaries
2017-11-14 11:13:24 +01:00
Frédéric FRANCE
96031b0787
Update listactions.php
2017-11-14 11:05:58 +01:00
Laurent Destailleur
11cb9c0d81
Code simpler
2017-11-14 01:57:50 +01:00
Laurent Destailleur
d0d1d646fd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-11-14 01:35:16 +01:00
Laurent Destailleur
3dc06977af
Update listactions.php
2017-11-14 01:33:44 +01:00
Laurent Destailleur
a12186a0b8
Use HTTP response code 304 instead of 500 when nothing is done
2017-11-14 01:26:02 +01:00
Laurent Destailleur
b5196b7164
FIX A lot of several fix on local taxes and NPR tax
2017-11-13 14:24:40 +01:00
Laurent Destailleur
1a5bbef266
FIX Locatax were not propagated when cloning order or proposal
2017-11-13 13:07:31 +01:00
alexis Algoud
19a2c2fe06
Merge branch 'NEW_burger_menu_list_action' of github.com:atm-alexis/dolibarr into develop
2017-11-13 10:05:29 +01:00
Laurent Destailleur
9a8423ba5e
Start to show work on repeat events
2017-11-13 02:46:13 +01:00
Laurent Destailleur
90615a8682
Fix busy tag not set sometimes
2017-11-13 02:44:02 +01:00
Laurent Destailleur
186c8cdbf0
Fix selection of contact into creation of event
2017-11-12 13:40:05 +01:00
Laurent Destailleur
836f6bf3c9
Fix search filter when using extrafields 'links'
2017-11-12 12:39:23 +01:00
Alexis Algoud
7922fd0281
NEW add burger menu to list action comm
2017-11-11 18:41:35 +01:00
Laurent Destailleur
d1860b87f8
NEW Add a confirmation for all mass action 'delete'
2017-11-11 16:34:11 +01:00
Laurent Destailleur
d938a56282
Clean code
2017-11-11 01:10:17 +01:00
Laurent Destailleur
ea5dd3eb3d
NEW Add REST API for supplier proposals
2017-11-06 11:06:31 +01:00
Laurent Destailleur
a329f7dc75
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
build/exe/doliwamp/doliwamp.iss
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/list.php
2017-11-05 18:50:14 +01:00
Laurent Destailleur
d3a0cff30a
Merge pull request #7755 from frederic34/currency
...
default currency on propal create
2017-11-05 18:28:40 +01:00
Laurent Destailleur
bac6a434f4
Add link to make a direct download on card
2017-11-04 17:11:58 +01:00
Laurent Destailleur
048766bd24
Fix sql error
2017-11-03 17:24:14 +01:00
Laurent Destailleur
c479efa480
Fix encoding with select2
2017-11-03 16:29:23 +01:00
Frédéric FRANCE
b58df17545
default currency on propal create
2017-11-02 18:14:55 +01:00
gauthier
03544f783a
FIX : Wrong alias sql
2017-11-02 16:16:29 +01:00
Laurent Destailleur
310bf4bde4
Update peruser.php
2017-11-02 15:51:35 +01:00
Laurent Destailleur
ec3a07cd52
Try to restore compatibility when actioncode=CODE1,CODE2,...
2017-11-02 15:50:55 +01:00
Laurent Destailleur
63a363080e
Update index.php
2017-11-02 15:48:56 +01:00
Laurent Destailleur
323a0d7d0d
Update index.php
2017-11-02 15:48:24 +01:00
Laurent Destailleur
1b28c45e2c
PERF Links in getNomUrl use only one tag a instead of 2.
2017-11-02 15:19:14 +01:00
gauthier
b7cf434ebd
FIX : Filter type on actioncomm with multiselect doesn't work
2017-11-02 14:58:33 +01:00
Laurent Destailleur
c226fc69d1
Update actioncomm.class.php
2017-11-02 10:45:27 +01:00
Laurent Destailleur
4220d02dd4
Debug module blocked log
2017-10-31 23:57:37 +01:00
Laurent Destailleur
9458c80c48
Work on reminders
2017-10-31 23:10:29 +01:00
Laurent Destailleur
b29f32171c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/comm/action/class/actioncomm.class.php
htdocs/contrat/card.php
htdocs/core/lib/project.lib.php
htdocs/filefunc.inc.php
2017-10-30 18:22:26 +01:00
Laurent Destailleur
d569218162
Fix 'separate' extrafields must be visible by default.
...
Sandardize name of list pages (must end with _list.php)
2017-10-29 11:23:20 +01:00
Laurent Destailleur
cd5e43483e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/lib/project.lib.php
htdocs/expedition/card.php
htdocs/projet/class/task.class.php
2017-10-28 22:08:16 +02:00
Laurent Destailleur
f02e731c67
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/lib/project.lib.php
2017-10-27 02:32:09 +02:00
Laurent Destailleur
708666349f
Minor fix
2017-10-26 18:35:32 +02:00
Laurent Destailleur
8058712d47
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/contrat/class/contrat.class.php
htdocs/product/list.php
2017-10-26 17:06:11 +02:00
Laurent Destailleur
67208b111d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/facture.php
htdocs/expedition/card.php
htdocs/product/list.php
2017-10-26 17:02:40 +02:00
Laurent Destailleur
202712be94
Work on module builder
2017-10-25 22:02:07 +02:00
Laurent Destailleur
f24204c79a
Error management after extrafield update
2017-10-24 19:04:40 +02:00
Laurent Destailleur
9f0f5eb5e8
Fix translation of extrafields type
2017-10-24 18:05:43 +02:00
Laurent Destailleur
c6e5115d34
Set default limit to 100 on all rest api that list
2017-10-22 15:42:19 +02:00
Laurent Destailleur
fb843430bf
FIX #7671
2017-10-22 03:22:31 +02:00
Laurent Destailleur
728e36f70f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/api/index.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/class/api_invoices.class.php
htdocs/core/actions_massactions.inc.php
htdocs/core/actions_sendmails.inc.php
2017-10-22 01:43:33 +02:00
Juanjo Menent
75580f253e
FIX: Agenda events are not exported in the ICAL, VCAL if begin exactly with the same $datestart
2017-10-20 12:57:32 +02:00
Laurent Destailleur
f7556e7ad2
FIX make of link to other object during creation
2017-10-19 19:06:48 +02:00
TuxGasy
9c3805c0d5
Fix anchor after add line
2017-10-19 14:10:58 +02:00
Laurent Destailleur
93d16bf4d7
Fix several fixes in APIs
2017-10-19 12:30:36 +02:00
Laurent Destailleur
9c45e86a1c
Introduce main_doc into table of objects to know what is main doc.
...
Work on option PROPOSAL_USE_ONLINE_SIGN
2017-10-19 11:40:40 +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
74b401b70d
Fix bad perm to delete file
2017-10-18 17:40:47 +02:00
Laurent Destailleur
8626d6279a
Fix perm to delete files
2017-10-18 17:21:30 +02:00
Laurent Destailleur
66538c7c0f
Position of method
2017-10-18 11:34:49 +02:00
Laurent Destailleur
037b90f2f3
NEW The comment when closing a proposal is added to commercial proposal
2017-10-18 11:23:16 +02:00
Laurent Destailleur
b124c7f16d
Clean params
2017-10-18 11:15:54 +02:00
Laurent Destailleur
000c1bddb2
Fix we lose the private not when closing proposal
2017-10-18 11:12:59 +02:00
Laurent Destailleur
d40dda83cf
Add API "close" for proposals
...
Standardize code
2017-10-18 11:10:08 +02:00
Laurent Destailleur
eb1fdca157
NEW Can create intervention from a proposal
2017-10-17 10:44:18 +02:00
Laurent Destailleur
082d59439f
Fix add missing seconds when adding event so sort order on date is ok
2017-10-17 10:43:37 +02:00
Laurent Destailleur
45ac8367bd
NEW Add API for contracts
2017-10-16 17:56:59 +02:00
Laurent Destailleur
4296df45af
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/projet/list.php
htdocs/user/card.php
2017-10-13 22:01:56 +02:00
Scrutinizer Auto-Fixer
165741517e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-13 11:28:26 +00:00
Laurent Destailleur
7c9993ef0e
Various fixes
2017-10-13 12:14:57 +02:00
Laurent Destailleur
2b55fb81b9
Standardize substition keys.
2017-10-13 10:35:21 +02:00
atm-ph
bab43b043e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
2017-10-13 09:52:56 +02:00
Laurent Destailleur
558f261b60
FIX #7593
2017-10-13 01:03:33 +02:00
Laurent Destailleur
8c5cf9ea45
Fix date output
2017-10-12 18:04:47 +02:00
Laurent Destailleur
084dc7798d
Standardize use of function getCommonSubstitutionArray
2017-10-09 14:51:42 +02:00
Laurent Destailleur
af1d2bfffd
Standardize code
2017-10-07 14:11:01 +02:00
Scrutinizer Auto-Fixer
328d39bc71
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-07 11:09:31 +00:00
Laurent Destailleur
8d47969d29
Merge pull request #7578 from OPEN-DSI/fix_0002
...
NEW add a new notification for the signed closed event of a proposal.
2017-10-06 17:36:23 +02:00
KHELIFA
88ab3a9cab
Add a new notification for the event that has successfully closed a proposal.
2017-10-06 16:15:40 +02:00
Laurent Destailleur
43d85af5ae
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-06 15:23:10 +02:00
Laurent Destailleur
ed467aa74b
FIX Only modified values must be modified
2017-10-06 15:01:31 +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
85606126a9
Standardize code for events
2017-10-04 12:58:13 +02:00
Laurent Destailleur
c22cd1cfe9
Fix test on entity must always be done using the "IN" instead of "="
2017-10-03 17:41:22 +02:00
Regis Houssin
09e71f1390
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-10-02 11:51:27 +02:00
Laurent Destailleur
3f3a5e0921
Merge pull request #7499 from atm-gauthier/NEW_custom_meteo
...
New custom meteo
2017-10-02 00:48:52 +02:00
Laurent Destailleur
0e15aef44f
CSS
2017-09-30 00:30:58 +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
f510f3062b
Clean param type
2017-09-28 17:41:18 +02:00
Laurent Destailleur
30a9e40f4e
Fix position of fields
2017-09-28 17:29:37 +02:00
Regis Houssin
9823d6622c
Fix: use default $shared value
2017-09-27 17:40:02 +02:00
Regis Houssin
20684b4505
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/rapport/pdf_paiement.class.php
htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
2017-09-27 17:22:18 +02:00
gauthier
1694737e0b
NEW : new param on load_board() function in ActionComm class to avoid duplicate code
2017-09-27 10:09:21 +02:00
Laurent Destailleur
36b199e78c
Merge pull request #7433 from tysauron/patch-11
...
For use ajax combobox for societe and contacts in action card create.
2017-09-26 20:13:52 +02:00
gauthier
7f938bc517
NEW : unexistant function load_state_board() on several objects
2017-09-26 12:32:58 +02:00
Laurent Destailleur
c9e9f60f8f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-09-25 19:55:52 +02:00
Regis Houssin
d592664150
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-09-25 06:48:26 +02:00
Laurent Destailleur
e3da4188e2
GETPOST must not clean data for text input.
2017-09-25 00:16:52 +02:00
Laurent Destailleur
adb3827d1e
FIX #7475
2017-09-24 22:55:27 +02:00
Laurent Destailleur
3a7aea48d7
FIX #7475
2017-09-24 22:38:18 +02:00
Laurent Destailleur
252f038468
Mutualize code of substitutions for emails
2017-09-22 14:34:31 +02:00
Laurent Destailleur
e56840b9ec
Clean deprecated code
2017-09-21 11:35:18 +02:00
Laurent Destailleur
d71916af7b
Merge pull request #7437 from tysauron/patch-12
...
Rename "->fk_action" in "->type_id"
2017-09-21 11:26:38 +02:00
Laurent Destailleur
8dfa87fcf6
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-19 19:30:28 +02:00
tysauron
5643d4e867
Rename "->fk_action" in "->type_id"
...
(is old name)
2017-09-19 17:26:18 +02:00
tysauron
0803e03ca9
For use ajax combobox for societe and contacts in action card create.
2017-09-19 14:53:34 +02:00
Laurent Destailleur
1e33495f42
Fix remove warnings
2017-09-19 00:31:51 +02:00
Laurent Destailleur
f936b17d68
FIX Protection to avoid to apply credit note discount > remain to pay
2017-09-19 00:24:52 +02:00
Regis Houssin
a03ef95eaa
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/tables/llx_c_payment_term.sql
2017-09-18 09:11:04 +02:00
Laurent Destailleur
fa18e788b5
Fix must use photo of user
2017-09-17 17:29:00 +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
e014ac6ea9
NEW Send by email available in bulk for expense report
2017-09-16 22:03:25 +02:00
Laurent Destailleur
0fec777d0e
NEW On bulk email from a list, can uncheck "Join main document".
...
NEW Show direct preview link on contract
2017-09-16 18:31:30 +02:00
Laurent Destailleur
630dc92a13
NEW Mass PDF Merging is available on contracts
2017-09-16 15:39:52 +02:00
Laurent Destailleur
e56b41c1ae
Clean code
2017-09-16 13:28:13 +02:00
Laurent Destailleur
0cf67944fa
Clean code
2017-09-16 13:14:46 +02:00
Laurent Destailleur
bd7c4fe940
NEW Summary of last events on a card are sorted on decreasing date.
2017-09-16 10:12:44 +02:00
Laurent Destailleur
b13dbf1f06
Clean code. Make selection of template working even if public.
2017-09-16 00:49:46 +02:00
Laurent Destailleur
2fcedcad74
Merge pull request #7410 from atm-florian/dev_better_propal_singend_form
...
NEW: confirm form style to accept or reject proposal
2017-09-15 18:58:25 +02:00
Laurent Destailleur
b63b0933e7
Update card.php
2017-09-15 18:57:39 +02:00
Regis Houssin
db17eb80ec
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/class/paymentterm.class.php
2017-09-15 16:45:49 +02:00
florian HENRY
c9df299418
NEW: confirm form style to accept or reject proposal
2017-09-15 16:06:25 +02:00
Laurent Destailleur
5e34b121dd
Add more robust php unit to detect not escaped sql. Fix not escaped sql
2017-09-15 15:41:07 +02:00
Laurent Destailleur
1a78e2a055
Mutualize/share code of all payments modes
2017-09-15 13:43:16 +02:00
florian HENRY
8b9b99ac40
fix : advance target emailing
2017-09-15 13:02:49 +02:00
Laurent Destailleur
e254554461
Code comment
2017-09-15 11:28:21 +02:00
Laurent Destailleur
1ffcb5d94e
FIX background color not visible in emailing view
2017-09-15 11:24:32 +02:00
Laurent Destailleur
0ade500535
Better support of text editor when no js available.
2017-09-15 11:19:56 +02:00
Laurent Destailleur
0873260b8a
USe second parameter in GETPOST
2017-09-15 10:50:50 +02:00
Laurent Destailleur
3b40c95107
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/class/categorie.class.php
2017-09-14 21:57:14 +02:00
Laurent Destailleur
c52e593ea8
Fix this->db
2017-09-14 21:27:14 +02:00
Laurent Destailleur
ed9c401ca6
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-14 12:20:26 +02:00
Laurent Destailleur
a38bbdcc05
Merge pull request #7382 from hregis/6.0_bug3
...
Fix: hide bank account field if module disabled
2017-09-14 12:14:45 +02:00
Regis Houssin
a494e01f00
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-14 12:07:19 +02:00
Laurent Destailleur
c44a5ede43
FIX Several problem with the last event box on project/tasks
...
Conflicts:
htdocs/core/lib/functions2.lib.php
2017-09-13 15:16:06 +02:00
Laurent Destailleur
7767ac2aa7
FIX Several problem with the last event box on project/tasks
2017-09-13 15:12:54 +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
939d33cce7
Fix bug reported by scrutinizer
2017-09-12 19:12:39 +02:00
Laurent Destailleur
47d2350ad4
Fix bugs reported by scrutinizer
2017-09-12 19:03:12 +02:00
Laurent Destailleur
71ce82b6b9
NEW Better autoselect customer or supplier fields to save clicks
2017-09-12 16:51:10 +02:00
Regis Houssin
cd888a2149
Fix: hide bank account field if module disabled
2017-09-12 15:13:12 +02:00
Laurent Destailleur
5dcbebbd46
NEW Add filters on month/year on the accountancy binding tools
2017-09-12 13:48:45 +02:00
Laurent Destailleur
1f56800a50
Merge pull request #7341 from atm-arnaud/NEW_task_discussion
...
New task discussion
2017-09-11 15:20:13 +02:00
Regis Houssin
b5de8da3a6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/modFacture.class.php
2017-09-11 08:07:55 +02:00
Laurent Destailleur
2ae135baf1
NEW Add view of status of template invoice
2017-09-10 20:47:45 +02:00
Laurent Destailleur
e7abb39ee2
NEW Template invoices are visible on the customer tab
2017-09-10 19:28:20 +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
Laurent Destailleur
03fe9d4e97
Escape all status
2017-09-08 13:23:12 +02:00
arnaud
8906c95eea
NEW comments system on task
2017-09-07 16:23:51 +02:00
Laurent Destailleur
bde293af22
Fix filter on extrafield with type sellist
2017-09-07 15:34:25 +02:00
Regis Houssin
66e548427c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/resultat/clientfourn.php
htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-07 10:50:35 +02:00
Laurent Destailleur
c5567fafd4
Enhancement for smartphone
2017-09-04 09:25:53 +02:00
Laurent Destailleur
e549e6cde1
Error management
2017-09-03 04:16:43 +02:00
Laurent Destailleur
4b9f54e571
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/data/llx_accounting.sql
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
htdocs/install/mysql/tables/llx_holiday_config.sql
2017-09-01 17:34:57 +02:00
Laurent Destailleur
61cf69f2bb
NEW Include a color syntaxed HTML editor for emailing edition.
2017-09-01 13:09:13 +02:00
atm-ph
8188abd4cd
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
2017-08-31 11:09:02 +02:00
Regis Houssin
8e8f94df11
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture-rec.class.php
2017-08-30 19:33:23 +02:00
Laurent Destailleur
d3c95e030b
Fix delete file not possible for external user even with permissions
2017-08-30 14:34:36 +02:00
Laurent Destailleur
7aa09d8b71
NEW Can create thirdparty from card proposal, order or invoice
2017-08-28 18:37:16 +02:00
Laurent Destailleur
a60cd49fb0
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
htdocs/core/class/CMailFile.class.php
htdocs/filefunc.inc.php
2017-08-28 12:53:02 +02:00
Laurent Destailleur
075a138e14
Fix substitution of __EMAIL__
2017-08-28 12:49:57 +02:00
Laurent Destailleur
c573df4f0e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/card.php
2017-08-26 22:33:56 +02:00
Laurent Destailleur
4052e15565
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/comm/action/card.php
2017-08-26 21:58:29 +02:00
Laurent Destailleur
54cc1ac800
Merge emailing target selectors.
2017-08-25 21:20:27 +02:00
Laurent Destailleur
d108d04add
NEW Can filter on the "other" column on emailing target list
2017-08-25 19:26:48 +02:00
Regis Houssin
1befd9c67f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-23 21:05:36 +02:00
Laurent Destailleur
90afbcb034
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/bank.php
htdocs/core/lib/functions.lib.php
2017-08-23 17:02:53 +02:00
Laurent Destailleur
aae24c26a3
Some fixes with smartphones
2017-08-22 20:20:34 +02:00
Regis Houssin
2f537a1ade
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/charges/index.php
htdocs/compta/paiement/list.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-22 18:49:40 +02:00
Regis Houssin
18ca96e285
Fix: file delete link doesn't work
2017-08-22 18:33:00 +02:00
Laurent Destailleur
2104ab9aed
Disable event reminder
2017-08-21 13:11:29 +02:00
Laurent Destailleur
8cd2235b4b
Start to introduce cron for email reminder.
2017-08-03 11:42:22 +02:00
Laurent Destailleur
fa752348c8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/various_payment/index.php
htdocs/contact/list.php
htdocs/langs/en_US/errors.lang
2017-08-02 17:56:09 +02:00
Laurent Destailleur
47ac770d93
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/expedition/card.php
htdocs/expedition/list.php
2017-08-02 17:51:19 +02:00
Laurent Destailleur
5b1f5b0f20
Fix translation done twice into field title of array
2017-08-02 13:31:53 +02:00
Laurent Destailleur
b6a7ce6822
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-08-01 10:22:37 +02:00
Laurent Destailleur
ddee802324
Add second parameter in GETPOST
2017-08-01 10:22:09 +02:00
Regis Houssin
0dc0fe81fc
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-31 07:40:01 +02:00
Laurent Destailleur
cfebbe3cc4
Fix css
2017-07-31 03:16:28 +02:00
Laurent Destailleur
80f096a9d8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-31 02:09:15 +02:00
Laurent Destailleur
837afa0e65
Fix better way to get info for contact/thirdparty on agenda
2017-07-29 04:07:46 +02:00
Laurent Destailleur
2a36166839
Fix error method on non object
2017-07-29 02:11:45 +02:00
Laurent Destailleur
cae21d3937
Fix in agenda output per user/type (reduce memory usage)
2017-07-29 01:59:26 +02:00
Laurent Destailleur
60493d0a47
Several fixes (permission, missing method or class) in REST APIs
2017-07-28 11:03:30 +02:00
Laurent Destailleur
ec27eb5b1e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/list.php
htdocs/societe/list.php
2017-07-27 02:09:40 +02:00
Laurent Destailleur
bdfb0b7561
FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes
2017-07-26 21:22:53 +02:00
Regis Houssin
acd5780e32
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-26 08:58:56 +02:00
Laurent Destailleur
5b9ac2a7a9
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/index.php
2017-07-25 21:11:36 +02:00
Laurent Destailleur
dafe1194c4
Merge pull request #7100 from tuxgasy/develop_addmoresummary_hook
...
Close: add new hook addMoreBoxStatsCustomer
2017-07-25 20:32:10 +02:00
Laurent Destailleur
f4857af7aa
Update card.php
2017-07-25 20:31:41 +02:00
Laurent Destailleur
cba898e2b9
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/facture.php
2017-07-25 10:12:28 +02:00
Laurent Destailleur
25b107defb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/contrat/list.php
htdocs/fichinter/list.php
2017-07-23 19:09:00 +02:00
Regis Houssin
26df1389f4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-07-21 20:42:21 +02:00
Laurent Destailleur
d07741ada1
Merge branch 'develop' into patch-rib
2017-07-21 14:58:33 +02:00
phf
885fc3c5b7
Fix lost search value in list if come from thirdparty card
2017-07-17 11:04:48 +02:00
Regis Houssin
200f232164
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-16 07:51:20 +02:00
Laurent Destailleur
312b153005
Fix phpcs
2017-07-13 23:46:01 +02:00
Laurent Destailleur
4ee70e496e
Merge pull request #7143 from hregis/6.0_bug
...
Fix: missing entity filter (multicompany)
2017-07-13 14:33:45 +02:00
Laurent Destailleur
bea3ced763
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-07-13 14:32:03 +02:00
Laurent Destailleur
58ce8eaf46
Merge pull request #7138 from atm-florian/6.0_fix_advtargetmailing
...
Fix AdvtargetEmailing
2017-07-13 14:26:23 +02:00
Laurent Destailleur
743de4e586
FIX Option to classify proposal/order in workflow module must not set
...
source object to billed if amount differs.
2017-07-13 12:42:32 +02:00
Laurent Destailleur
028f1f5133
Fix default currency in creation form.
2017-07-13 10:16:40 +02:00
Laurent Destailleur
2870798d07
Fix remove warnings
2017-07-13 00:35:10 +02:00
Laurent Destailleur
4b4dcf2e01
Fix overload with a protection for rare case with very high nb of event
2017-07-12 23:05:26 +02:00
florian HENRY
816283d1e5
fix SQL
2017-07-12 17:51:32 +02:00
florian HENRY
67664331e3
Merge branch '6.0' of local repository into 6.0_fix_advtargetmailing
2017-07-12 17:49:44 +02:00
Regis Houssin
9430952561
Fix: missing entity filter (multicompany)
2017-07-12 11:00:18 +02:00
Regis Houssin
cb6b81d897
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-11 19:10:22 +02:00
florian HENRY
c85bf18f0e
Fix AdvtargetEmailing
2017-07-11 14:47:37 +02:00
Laurent Destailleur
10cb7b2524
Fix remove warnings
2017-07-09 20:31:27 +02:00
Laurent Destailleur
e1ba69eee0
Fix edit of automatic event should keep its type.
2017-07-08 00:19:30 +02:00
Laurent Destailleur
34d0c79e32
Merge pull request #7124 from fappels/develop_updateline_notriggerflag
...
New add trigger disable to updateline functions
2017-07-07 20:30:04 +02:00
Laurent Destailleur
640f66f017
Fix SQL syntax
2017-07-07 17:34:56 +02:00
Laurent Destailleur
de1a7042d4
Fix filter on list of actions
2017-07-07 10:55:42 +02:00
fappels
6effcb0829
New add trigger disable to updateline functions
2017-07-06 16:26:15 +02:00
TuxGasy
bec5bde363
Move addMoreBoxStatsCustomer after table tag
2017-07-06 12:18:54 +02:00
phf
49b8689f2d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
2017-07-05 11:02:39 +02:00
TuxGasy
67f11103a3
fix indent
2017-07-04 21:56:47 +02:00
Laurent Destailleur
0ee93fb00c
Fix conflict between option login and logina and logint in agenda export
2017-07-04 10:29:38 +02:00
Regis Houssin
3f882cb33a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-07-03 09:24:05 +02:00
TuxGasy
1f9bd2538e
new addMoreBoxStatsCustomer hook
2017-07-02 22:20:07 +02:00
Laurent Destailleur
7ae52d843c
Look and feel v6
2017-07-01 14:23:24 +02:00
Regis Houssin
fa247ffd98
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-29 08:51:42 +02:00
Laurent Destailleur
b6002bd1f8
Fix bad link
2017-06-28 18:29:57 +02:00
Laurent Destailleur
6f82837b0f
Fix GETPOST of lang_id
2017-06-27 17:27:01 +02:00
Laurent Destailleur
08af9bf365
List before
2017-06-27 10:37:00 +02:00
Laurent Destailleur
34f3552dc7
Fix missing image of user
2017-06-27 04:31:29 +02:00
Laurent Destailleur
3fdfebf7ef
Fix position of top menu does not follow 'position' field.
2017-06-27 04:25:41 +02:00
Juan Bautista Mesa Roldán
0f5dc90bae
Fixing pages warning when value is null
2017-06-24 16:45:45 +02:00
Laurent Destailleur
4102403482
Look and feel v6
2017-06-21 11:37:34 +02:00
Regis Houssin
909826e24f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-20 06:25:35 +02:00
Laurent Destailleur
bb2d27280b
Fix sort link must be disabled for computed field
2017-06-19 14:31:08 +02:00
Regis Houssin
544d051fe3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-19 07:06:57 +02:00
Laurent Destailleur
996ec4926b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/lib/files.lib.php
htdocs/don/card.php
2017-06-18 22:16:34 +02:00
Laurent Destailleur
317ab64d7c
Fix escapement
2017-06-18 22:03:25 +02:00
Laurent Destailleur
f3a5975cf8
Fix sql injection
2017-06-18 21:58:56 +02:00
Laurent Destailleur
0ef507ae7f
Fix rename of file to remove .noexe extension.
2017-06-18 21:52:51 +02:00
Laurent Destailleur
86a6a83647
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/admin/tools/index.php
htdocs/bookmarks/bookmarks.lib.php
htdocs/compta/facture.php
htdocs/core/tpl/passwordforgotten.tpl.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/main.inc.php
htdocs/product/stats/card.php
htdocs/public/paypal/paymentko.php
2017-06-18 21:13:48 +02:00
Regis Houssin
a0299042e4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-17 12:05:33 +02:00
Laurent Destailleur
e813fd2dfa
Fix missing key import_key and extraparams
2017-06-16 12:57:30 +02:00
Laurent Destailleur
5a477bdd6d
Merge pull request #7018 from hregis/develop_bug_restapi
...
Fix: missing _cleanObjectDatas function
2017-06-16 12:53:11 +02:00
Laurent Destailleur
492ee135ba
Merge pull request #7011 from hregis/develop_bug3
...
Fix: error when the project module not enabled
2017-06-16 12:51:28 +02:00
Regis Houssin
c2901ae8cd
Fix: add/remove unset unsused fields
2017-06-16 11:01:58 +02:00
Regis Houssin
c656856ec2
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug_restapi
2017-06-16 10:52:43 +02:00
Laurent Destailleur
07b676792a
Fix do not show localtax info if not used.
2017-06-16 01:02:53 +02:00
Regis Houssin
9410466d72
Fix: better check and security
2017-06-15 21:51:31 +02:00
Regis Houssin
78d5520741
Fix: missing _cleanObjectDatas function
2017-06-15 21:23:35 +02:00
Regis Houssin
cd095e99c9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-14 12:16:10 +02:00
Regis Houssin
8eb3f3bc06
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug3
2017-06-14 12:13:23 +02:00
Laurent Destailleur
1b56e4a01c
Fix look and feel v6
2017-06-14 11:28:42 +02:00
Regis Houssin
50aa40da3b
Fix: error when the project module not enabled
2017-06-14 07:40:11 +02:00
Regis Houssin
773abff80e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-12 21:24:10 +02:00
Laurent Destailleur
ba3a74576c
Merge 5.0
2017-06-12 18:22:51 +02:00
florian HENRY
71afaaa360
fix : availibity refresh
2017-06-12 17:24:36 +02:00
Regis Houssin
d1233755f6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-11 11:41:02 +02:00
Laurent Destailleur
a96362e2f9
Fix #formmailbeforetitle not supported everywhere
2017-06-11 11:40:01 +02:00
Regis Houssin
cc75916599
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-11 11:26:24 +02:00
Laurent Destailleur
e93cefbbf0
FIX #6985
2017-06-11 10:37:58 +02:00
Regis Houssin
3445c9d329
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/lib/functions.lib.php
2017-06-11 06:27:49 +02:00
Laurent Destailleur
6ab47a845e
Fix look and feel v6
2017-06-10 13:54:43 +02:00
Laurent Destailleur
a8e16910c0
Fix look and feel v6
2017-06-10 13:44:20 +02:00
Laurent Destailleur
7c0de18ac1
Fix code comment
2017-06-10 12:56:28 +02:00
phf
0f80ee757f
Fix can not update extrafields values
2017-06-09 16:37:05 +02:00
Regis Houssin
fa58f0f3e8
Fix: add entity filter
2017-06-09 09:25:15 +02:00
Laurent Destailleur
b441c62e1d
Fix syntax error
2017-06-08 14:55:12 +02:00
Laurent Destailleur
b1f93ccb0c
Fix security
2017-06-08 14:33:46 +02:00
phf
d6d451b54a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
2017-06-08 12:03:59 +02:00
phf
711f9696aa
New multi contacts on actioncomm
2017-06-08 12:02:39 +02:00
Regis Houssin
2b36135641
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-07 20:14:03 +02:00
Laurent Destailleur
1820649175
Maxi debug of v6
2017-06-07 19:28:31 +02:00
Regis Houssin
bfd6116e5b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2017-06-06 15:03:36 +02:00
Laurent Destailleur
02b5d9e6f7
FIX #6945
2017-06-06 10:53:53 +02:00
Regis Houssin
2df33d1df3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-03 11:45:15 +02:00
Laurent Destailleur
7f18dfee0d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/build_class_from_table.php
dev/skeletons/skeleton_card.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/projet/card.php
2017-06-03 01:55:05 +02:00
phf
31aa8bdf05
Fix week view link has wrong link
2017-06-01 16:26:32 +02:00
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
David
d8c5ec2aef
FIX: REST API not possible to add agendaevents
2017-05-29 13:47:42 +02:00
Laurent Destailleur
dc246fa44c
Merge pull request #6887 from hregis/develop_new
...
New: add REST api "dictionaryevents" for use with "agendaevents"
2017-05-29 10:16:35 +02:00
Laurent Destailleur
de1db57a9d
Merge pull request #6883 from dvasseur/develop
...
FIX: REST API not possible to add agendaevents
2017-05-29 10:12:33 +02:00
Regis Houssin
ee2019ae37
Fix: limit to 100 by default to avoid freeze
2017-05-26 16:52:27 +02:00
David
3898cfe02f
FIX: REST API not possible to add agendaevents
2017-05-23 18:27:41 +02:00
Laurent Destailleur
2da50f1eca
Look and feel v6
2017-05-23 01:32:19 +02:00
Laurent Destailleur
f5e29d6c86
Fix phpcs warning
2017-05-22 10:45:02 +02:00
Laurent Destailleur
b3dc73e611
Look and feel v6
2017-05-21 02:43:51 +02:00
Laurent Destailleur
807c77f754
Fix inconsistent options
2017-05-19 18:03:49 +02:00
Laurent Destailleur
bb2a9f9d0e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-19 17:24:31 +02:00
Laurent Destailleur
c30dcf78cb
Show info when link has been deleted
2017-05-19 17:24:15 +02:00
Laurent Destailleur
d1c4439a0f
Merge pull request #6858 from OPEN-DSI/module_agenda_linked_object_option
...
NEW Module Agenda: Add option - Show linked object into agenda view
2017-05-19 17:23:54 +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
ef575166c0
FIX #6651
2017-05-18 19:10:05 +02:00
Laurent Destailleur
7dbe3b1da9
Merge pull request #6843 from aspangaro/6.0-multijournal
...
Fix : Sql error on salaries index for accountancy multijournal + debug
2017-05-18 17:45:21 +02:00
KHELIFA
169859b708
Module Agenda: Add option - Show linked object into agenda view
2017-05-17 17:00:45 +02:00
Laurent Destailleur
68e333879f
Fix var not sanitized
2017-05-16 13:27:32 +02:00
Alexandre SPANGARO
93554b7e30
Typo searchpicto
2017-05-14 21:06:33 +02:00
Laurent Destailleur
553f5b990c
Fix scrutinizer errors
2017-05-13 18:50:55 +02:00
Laurent Destailleur
fa290c34fa
Fix against SQL injection. Add phpunit to detect missing escapement.
2017-05-12 16:55:11 +02:00
Laurent Destailleur
0d11fce834
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-12 15:45:30 +02:00
Laurent Destailleur
b81de35703
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/sociales/class/chargesociales.class.php
htdocs/contrat/class/contrat.class.php
2017-05-12 15:44:09 +02:00
Laurent Destailleur
419c15ee8e
Fix escaping class
2017-05-12 15:28:10 +02:00
Laurent Destailleur
5581e5da72
FIX New vat code not correctly implemented if "1 price per customer".
2017-05-12 13:12:17 +02:00
Laurent Destailleur
2199c525bc
Merge pull request #6805 from grandoc/new_branch_06_05
...
Update code using new css class
2017-05-10 22:51:31 +02:00
Laurent Destailleur
5e54567558
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/skeleton_list.php
2017-05-10 13:30:35 +02:00
Laurent Destailleur
3e0fcf5ec2
Fix label "total for this page" on last page.
2017-05-10 11:57:59 +02:00
Laurent Destailleur
e5c898e0d6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
build/makepack-dolibarr.pl
htdocs/fichinter/list.php
htdocs/product/list.php
htdocs/projet/tasks/list.php
2017-05-10 00:48:27 +02:00
Laurent Destailleur
6d01bd712d
FIX Better sanitizing of search all parameter.
2017-05-09 19:36:10 +02:00
Laurent Destailleur
910a925167
NEW Add last activation author and ip of modules
2017-05-06 20:43:14 +02:00
philippe grand
55feea5d98
Update code using new css class
2017-05-06 10:54:28 +02:00
Laurent Destailleur
d53654e64f
Look and feel v6
2017-05-05 20:45:06 +02:00
Laurent Destailleur
d7e10085b8
Clean code. Using 2 different key for a param is not more allowed.
2017-05-05 18:42:11 +02:00
Laurent Destailleur
11b1a2adac
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
2017-05-05 14:49:25 +02:00
Laurent Destailleur
0bffac6dc4
Use constant vor status.
2017-05-05 13:43:43 +02:00
Laurent Destailleur
8f5fa1d810
Merge pull request #6769 from atm-ph/fix_propal_without_fetch_lines
...
Fix Propal class doesn't have fetch_lines method yet
2017-05-05 10:01:42 +02:00
Laurent Dinclaux
a1e9246794
Resolved merge conflict [2]
2017-05-05 10:34:38 +11:00
Laurent Dinclaux
24a2fb57ea
Resolved merge conflict
2017-05-05 10:22:46 +11:00
Laurent Destailleur
0c76db7973
FIX #6698 #6742
2017-05-04 13:41:37 +02:00
Laurent Destailleur
8318ebc109
Fix missing field into addline of proposals
2017-05-04 10:45:20 +02:00
David
270c3db32e
fix params order for tha addline() function
...
please check to last param "$request_data->fk_remise_except", I couldn't find a corresponding parameter name in the addline() function
2017-05-04 10:16:36 +02:00
Laurent Destailleur
322cca8032
Merge pull request #6731 from dvasseur/develop
...
FIX: fix params order for the addline() function
2017-05-04 09:55:33 +02:00
Laurent Dinclaux
f63f28c7fe
Fix vat_src_code propagation between post types
2017-05-03 21:37:30 +11:00
Laurent Dinclaux
98b2e83bfb
Fix localtaxes type not retrieved in proposals. Fixes Dolibarr/dolibarr/#6786
2017-05-03 21:36:56 +11:00
Laurent Destailleur
3917bdfc79
Fix vat_src_code propagation.
2017-05-02 22:37:43 +02:00
Laurent Destailleur
865c8140d1
Clean code
2017-04-30 03:23:06 +02:00
phf
88515c306f
Fix Propal class doesn't have fetch_lines method yet
2017-04-28 14:33:06 +02:00
Laurent Destailleur
c722286bcb
Fix regressions
2017-04-28 13:37:36 +02:00
Laurent Destailleur
cfde27820e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/translation.php
htdocs/comm/card.php
htdocs/core/menus/standard/eldy.lib.php
2017-04-27 17:20:40 +02:00
Laurent Destailleur
0080821dc5
Fix no invoice if not a customer
2017-04-23 16:05:54 +02:00
Philippe Grand
c18e7e8816
Merge branch 'develop' into testing
2017-04-19 11:27:36 +02:00
Philippe Grand
529ae1fa92
Update propal.class.php
2017-04-19 10:01:43 +02:00
David
8bb7f858d9
fix params order for tha addline() function
...
please check to last param "$request_data->fk_remise_except", I couldn't find a corresponding parameter name in the addline() function
2017-04-18 16:47:06 +02:00
Laurent Destailleur
3da0aea168
Prepare code to use different SMTP servers.
2017-04-18 01:39:06 +02:00
Laurent Destailleur
0994622bf8
NEW Can use translations into all substitutions (watermark, freetext...)
2017-04-17 23:54:09 +02:00
Laurent Destailleur
4c056d68d8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/commande/list.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/bills.lang
htdocs/societe/list.php
2017-04-15 17:02:05 +02:00
Laurent Destailleur
846204bdb4
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 13:02:29 +02:00
Laurent Destailleur
39ebaec064
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 11:22:48 +02:00
Laurent Destailleur
a6b05bb4da
Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0
2017-04-12 14:08:58 +02:00
Laurent Destailleur
26a9999fbf
Support of preview for pdf with several pages
2017-04-12 11:38:55 +02:00
philippe grand
06c91cdaf2
ref column was missing for specimen and some update
2017-04-11 14:47:11 +02:00
Laurent Destailleur
6aa56ce0fa
NEW Add a tracking id into mass emailing
...
Prepare code to use a dedicated SMTP server according to context.
2017-04-11 10:57:17 +02:00
Laurent Destailleur
9b45776941
Fix responsive
2017-04-10 17:25:53 +02:00
Laurent Destailleur
52c86cb3f5
NEW Bulk actions available on supplier orders
2017-04-09 13:12:25 +02:00
Laurent Destailleur
be439f6252
Work on look and feel v6
2017-04-07 16:16:44 +02:00
Laurent Destailleur
60a54041c2
NEW Enable bulk actions delete on supplier invoices
2017-04-07 14:09:19 +02:00
Widee
89716a86a5
Avoid (DEPOSIT) (1) & (2) descriptions
...
When splitting a rebate into two parts, the word "DEPOSIT" is no longer translated on the invoices.
2017-04-04 12:22:51 +02:00
Laurent Destailleur
d99b0461c7
Extrafields multilanguage support.
2017-04-03 10:56:28 +02:00
Laurent Destailleur
e221c48997
Css
2017-04-01 00:59:21 +02:00
Laurent Destailleur
7254b54a04
Work on 6.0 look and feel
2017-04-01 00:49:06 +02:00
Laurent Destailleur
93687997c9
Work on 6.0 look and feel
2017-03-31 18:40:53 +02:00
Laurent Destailleur
7056edf509
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-31 18:32:36 +02:00
Laurent Destailleur
6e0918dded
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-03-31 18:31:54 +02:00
Laurent Destailleur
911d5832c6
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-03-31 18:30:41 +02:00
Laurent Destailleur
b44143d24d
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
2017-03-31 18:29:15 +02:00
Laurent Destailleur
01a74a8d23
Work on 6.0 look and feel
2017-03-31 17:41:20 +02:00
Laurent Destailleur
da1427ef54
Work on 6.0 look and feel
2017-03-30 16:10:08 +02:00
Laurent Destailleur
54b03a3552
Work on 6.0 new look and feel
2017-03-29 11:03:13 +02:00
Laurent Destailleur
e416ea275e
Work on 6.0 look and feel
2017-03-28 21:04:38 +02:00
Laurent Destailleur
3740137e31
Add tooltip on label of each open item.
2017-03-28 10:44:52 +02:00
Laurent Destailleur
f843f8a93d
Start to move search bar before table titles
2017-03-27 00:48:50 +02:00
BENKE Charlie
f4a7217f20
display total line for all total line
2017-03-26 01:49:48 +01:00
Laurent Destailleur
106d19a8af
FIX #6468 + Fix missing translation
2017-03-25 03:53:11 +01:00
Laurent Destailleur
aa9d991923
Fix css
2017-03-25 01:03:02 +01:00
BENKE Charlie
94a1fc19fa
display total line for all total line
2017-03-24 23:39:25 +01:00
Laurent Destailleur
38660418b4
Include preview of pdf into dol_banner
2017-03-23 22:27:44 +01:00
Laurent Destailleur
3adb43c6e5
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/boxes/box_produits.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/langs/en_US/bills.lang
htdocs/product/class/product.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-03-23 12:52:19 +01:00
Laurent Destailleur
7df9c25e60
Several fixes on multicurrency
2017-03-23 12:44:20 +01: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
Laurent Destailleur
888675016d
NEW Can use dol_fiche_end without showing bottom border.
2017-03-15 11:13:30 +01:00
Laurent Destailleur
7f8c4d7d0f
Fix CSS
2017-03-14 14:33:25 +01:00
hugome
38ccf7ffdd
Fix : Agenda getCalendarEvents hook
...
Return of getCalendarEvents on agenda page :
The array_merge change key of merged array.
2017-03-13 11:35:49 +01:00
Laurent Destailleur
4bf0e31299
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/loan.lang
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-03-11 02:40:42 +01:00
Laurent Destailleur
47dd53abbe
NEW The substitution keys available for emailing edition is now into a
...
popup
2017-03-11 02:36:22 +01:00
Laurent Destailleur
30c2ac37d5
Fix missing separator
2017-03-11 02:35:01 +01:00
Laurent Destailleur
618c27d63c
Optimize space
2017-03-10 16:26:43 +01:00
Laurent Destailleur
184d52525a
PHP code to manage pair/impair is replaced by native CSS.
2017-03-07 22:45:22 +01:00
Laurent Destailleur
5f79b2d0c6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/accountancy/admin/categories.php
htdocs/expensereport/class/expensereport.class.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2017-03-05 22:11:35 +01:00
Laurent Destailleur
f67c967d0b
FIX The vat rate line used when adding a predefined product was wrong if
...
there is several vat line with same rate.
2017-03-04 22:27:44 +01:00
Laurent Destailleur
832c91417a
Fix the default_vat_code was not correctly saved and shown on the
...
product price.
2017-03-04 19:16:09 +01:00
Laurent Destailleur
4804cc47bd
Clean and uniformize code
2017-02-24 15:16:53 +01:00
Laurent Destailleur
fb88eaf2a4
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-02-23 02:55:50 +01:00
Laurent Destailleur
e981e719a1
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/comm/action/card.php
2017-02-23 02:54:40 +01:00
Laurent Destailleur
92d9eb3c5d
Several fix for a better management of #6424
2017-02-22 17:46:54 +01:00
Laurent Destailleur
19e60f03b9
Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms
2017-02-21 14:17:44 +01:00
Laurent Destailleur
eef3824f8c
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/categories.php
htdocs/admin/dict.php
htdocs/langs/de_DE/bills.lang
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/bills.lang
2017-02-21 10:34:52 +01:00
jfefe
0a9ffa58c1
FIX : event status is not modified when assign an user
2017-02-20 09:54:20 +01:00
Laurent Destailleur
fd111cb1c6
NEW tooltip can be on hover or on click with textwithpicto function.
2017-02-17 17:11:14 +01:00
Laurent Destailleur
7f21c3f3f2
Fix css email topic
2017-02-17 13:16:29 +01:00
Laurent Destailleur
8d03f86f45
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-17 13:10:46 +01:00
Laurent Destailleur
37caae3466
Merge pull request #6427 from laudeco/fix/calendar_move_error
...
allow the drag and drop of an event only for allowed users
2017-02-17 10:46:15 +01:00
Laurent Destailleur
498473715e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-17 01:48:43 +01:00
Laurent Destailleur
4c310964a9
Fix list of supplier proposals
2017-02-17 01:41:33 +01:00
De Coninck Laurent
979a5e70bf
allow the drag and drop of an event only for allowed users
...
The drag and drop of the event didn't take into account the user rights.
2017-02-16 07:51:46 +01:00
fmarcet
c175dfe68b
Fix: Bad code makes don't work for external modules numeration model
2017-02-15 09:47:18 +01:00
fmarcet
e903bf2b5c
Fix: Bad code makes don't work for external modules numeration model
2017-02-14 18:55:39 +01:00
Laurent Destailleur
d72e5a3646
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-10 17:34:23 +01:00
Laurent Destailleur
ca67917e80
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/modules/modFacture.class.php
2017-02-10 17:33:32 +01:00
Laurent Destailleur
a4f2325902
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-02-10 17:28:49 +01:00
Laurent Destailleur
e1a6e6e4ab
Rename "attributes" into "variants" to avoid confusion with extrafields
2017-02-08 12:37:38 +01:00
Laurent Destailleur
b24f244f67
Merge pull request #5533 from marcosgdf/prod-attr
...
Feature Request: NEW Added product attributes feature
2017-02-08 11:20:33 +01:00
Laurent Destailleur
b611c5ca53
Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received
...
NEW Develop new reduc on excess received
2017-02-08 11:16:10 +01:00
fmarcet
d5978a5092
Fix: Wrong vat calculation when split discounts
2017-02-07 14:02:27 +01:00
Laurent Destailleur
ce067f9130
Merge branch 'new_link_weather_board' of
...
https://github.com/atm-geoffrey/dolibarr into
atm-geoffrey-new_link_weather_board
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/index.php
2017-02-06 20:51:46 +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
bda915c63a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-03 15:34:59 +01:00
Marcos García de La Fuente
d06fb423c0
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/langs/en_US/products.lang
2017-02-02 20:07:41 +01:00
Laurent Destailleur
40737eac2e
FIX #6361
2017-02-02 02:49:04 +01:00
Laurent Destailleur
c3fb559d3b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modProduct.class.php
2017-02-01 20:58:17 +01:00
Laurent Destailleur
45263c85ec
Fix in emailing
2017-01-29 20:33:08 +01:00
Laurent Destailleur
ff8b7e6e4d
Fix size of email
2017-01-29 18:35:56 +01:00
Laurent Destailleur
92e61e6707
Fix hide url if not defined
2017-01-29 18:29:37 +01:00
Laurent Destailleur
756919de2a
Fix deadlock feature: could not solve a situation where an emailing was
...
validated by error.
2017-01-29 16:08:45 +01:00
Laurent Destailleur
b4b81d8dcb
Fix css and missing translation key
2017-01-29 15:07:18 +01:00
Laurent Destailleur
c48400331f
Merge pull request #6157 from atm-ph/new_develop_use_rate_on_document_date
...
NEW get multicurrency rate from document date (propal, order)
2017-01-27 01:32:52 +01:00
Laurent Destailleur
1878647d26
NEW Add statistics on supplier tab.
2017-01-23 20:54:52 +01:00
Laurent Destailleur
9a59fbada7
Fix missing info admin picto. Fix colspan.
2017-01-23 17:31:39 +01:00
Laurent Destailleur
7622d3b2fb
Fix missing info admin picto. Fix colspan.
2017-01-23 10:23:24 +01:00
Laurent Destailleur
39151d7a74
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-22 12:14:18 +01:00
Laurent Destailleur
65f7de8f64
Fix css and look 5.0
2017-01-22 12:13:32 +01:00
Laurent Destailleur
809e3ce4d5
Debug browser notification
2017-01-20 20:10:16 +01:00
Juanjo Menent
2374aa351e
Merge remote-tracking branch 'upstream/develop' into develop
2017-01-20 15:55:51 +01:00
Laurent Destailleur
5b8ff63981
Fix bad value
2017-01-20 14:17:58 +01:00
Laurent Destailleur
6780b20968
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-20 14:11:55 +01:00
Laurent Destailleur
2f4ff66c43
Minor fixes
2017-01-20 14:10:57 +01:00
Laurent Destailleur
94249b7926
NEW Add statistics on tabs
2017-01-20 14:03:07 +01:00
Laurent Destailleur
b4733e043c
Fix tooltip when customer is closed
2017-01-20 12:17:10 +01:00
Laurent Destailleur
412be59f78
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-01-20 12:09:39 +01:00
Laurent Destailleur
9bb9d4d36e
Fix position of field and tooltip
2017-01-20 12:08:33 +01:00
Marcos García de La Fuente
e0cbcadd98
In case Model for document generation is not defined, the criteria to select the model is now:
...
1. Model for the object
2. Custom default module
3. Hardcoded default module
2017-01-16 21:16:05 +01:00
Laurent Destailleur
4ecd657f34
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-16 00:02:43 +01:00
Laurent Destailleur
d14e4dbaba
Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on
2017-01-15 20:49:20 +01:00
Marcos García de La Fuente
d09a3628c5
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/compta/facture.php
2017-01-14 23:59:14 +01:00
Laurent Destailleur
6aa26e0f62
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/paiement.php
htdocs/product/stock/massstockmove.php
htdocs/projet/info.php
htdocs/projet/tasks/time.php
htdocs/societe/class/societe.class.php
2017-01-13 16:49:18 +01:00
Juanjo Menent
6cc3ef0c99
NEW: Events notifications in browser
2017-01-13 16:08:49 +01:00
Laurent Destailleur
31818e8816
Fix missing translation
2017-01-13 15:32:20 +01:00
Laurent Destailleur
27c056d377
Avoid duplicate function error
2017-01-03 11:30:27 +01:00
Laurent Destailleur
b642a3a602
Prepare release 5.0
2016-12-31 16:35:56 +01:00
Marcos García de La Fuente
47a444b2ab
Merge branch 'develop' into prod-attr
2016-12-27 15:54:53 +01:00
Laurent Destailleur
82052450a6
Complete work on dol_banner
2016-12-26 18:21:18 +01:00
Laurent Destailleur
bbd3734a21
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
2016-12-26 12:42:23 +01:00
Laurent Destailleur
e297b64722
Several security fix in using mailings.
2016-12-26 12:35:10 +01:00
Marcos García de La Fuente
5669f734b8
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/comm/propal/card.php
# htdocs/commande/card.php
# htdocs/compta/facture.php
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-12-24 21:39:40 +01:00
Laurent Destailleur
a2133f391f
Complete work on dol_banner
2016-12-23 14:52:25 +01:00
Laurent Destailleur
b777ec79f2
Fix contextpage implementation into skeleton
2016-12-23 10:38:27 +01:00
Laurent Destailleur
9e44eb0d15
Fix return code REST similar for all api with POST
2016-12-23 02:08:22 +01:00
