Alexis Algoud
c2f4f2fd9c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_details_per_warehouse_into_reassort
2016-05-02 09:38:42 +02:00
Laurent Destailleur
5823055cdf
Work on website module.
2016-05-01 21:19:29 +02:00
Laurent Destailleur
46e2ed2810
NEW: All variant of ckeditor config can be tested into the setup page of
...
module.
2016-05-01 20:36:42 +02:00
Laurent Destailleur
170dc467ff
Better code for website edition
2016-05-01 19:49:03 +02:00
aspangaro
1f015388b6
FIX: Fiscal year - Some mistakes on card
2016-05-01 17:04:55 +02:00
Laurent Destailleur
3045449dbb
Work on website module. Can delete a page.
2016-05-01 17:01:38 +02:00
Laurent Destailleur
f59f3032c6
NEW: Rename path for generic medias files into '/medias' instead of
...
fckeditor. Add location of medias into title of media browser of
ckeditor.
Work on website module
2016-05-01 16:34:50 +02:00
Laurent Destailleur
87231908df
Fix missing object constructor
2016-05-01 11:07:05 +02:00
aspangaro
88435a0d80
NEW: Accountancy - Prepare multiple journals
2016-05-01 08:03:40 +02:00
Laurent Destailleur
f324c662c2
Better update of database cleaning non expected records.
2016-04-30 21:58:00 +02:00
Laurent Destailleur
50323afe94
Add comment
2016-04-30 21:33:18 +02:00
Laurent Destailleur
6a123c91b5
Solve warnings that appears because code is using statically a mehtod
...
that can't be static yet.
2016-04-30 19:30:28 +02:00
Frédéric FRANCE
ffd80e3f8f
select engine for code 128 didn't work
2016-04-30 18:56:16 +02:00
Laurent Destailleur
9c855f3a5e
Start to work to have custom dir available and active by default.
2016-04-30 17:11:48 +02:00
Laurent Destailleur
a8363052c6
Better style
2016-04-30 15:55:39 +02:00
Laurent Destailleur
de59d115d9
Option THIRDPARTY_CUSTOMERPROSPECT_BY_DEFAULT and
...
THIRDPARTY_SUPPLIER_BY_DEFAULT to have fields customer/prospect/supplier
set when creating a new thirdparty.
2016-04-30 14:59:40 +02:00
frederic34
17463b4927
categories account like other categories
2016-04-30 14:45:24 +02:00
Laurent Destailleur
e61e717cac
FIX Bad permission to edit bank account on customer invoice
2016-04-30 14:28:48 +02:00
Laurent Destailleur
f747018fb6
Clean dead code
...
FIX when editing price with tax, reset price without so i will be
recalculated.
2016-04-30 14:24:33 +02:00
Laurent Destailleur
97bf91cc5d
Show both currency symbol and code
2016-04-30 14:09:00 +02:00
Laurent Destailleur
6ffb45f5d8
FIX Missing param user on update()
2016-04-30 13:58:35 +02:00
Laurent Destailleur
9e24abacac
Missing translation load
2016-04-30 13:26:31 +02:00
aspangaro
e6843a64ae
FIX: Accountancy - 3.8 - Chart of accounts are limited on only one country
2016-04-30 07:13:23 +02:00
aspangaro
3cf1d891ab
FIX: Accountancy - 3.9 - Chart of accounts are limited on only one country
2016-04-30 07:05:10 +02:00
aspangaro
7041a041ce
FIX: Accountancy - Chart of accounts are limited on only one country
2016-04-30 06:52:21 +02:00
Laurent Destailleur
e717baefe5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-30 01:43:44 +02:00
Laurent Destailleur
4e9ea2786a
Fix s
2016-04-30 01:43:34 +02:00
BENKE Charlie
379a621b1f
soory it's a mistake
2016-04-30 01:01:32 +02:00
Laurent Destailleur
1bfc7e9b70
Merge pull request #5104 from fappels/patch-1
...
Update product.class.php
2016-04-30 00:28:22 +02:00
Laurent Destailleur
019398857a
Merge pull request #5099 from aspangaro/4.0-p24
...
FIX: Accountancy - Upgrade Cegid Bank export
2016-04-30 00:27:36 +02:00
Laurent Destailleur
e8bd1357f3
More help to use REST API
2016-04-30 00:00:59 +02:00
aspangaro
35c87972bb
Merge remote-tracking branch 'Upstream/develop' into 4.0-p24
2016-04-29 20:47:52 +02:00
Laurent Destailleur
0cde6ad98f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/filefunc.inc.php
2016-04-29 20:43:42 +02:00
Laurent Destailleur
3d9456b202
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/fourn/facture/list.php
2016-04-29 20:42:35 +02:00
Laurent Destailleur
755b994750
Prepare 3.9.2
2016-04-29 20:40:00 +02:00
Laurent Destailleur
53386e22ea
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/expedition/class/expedition.class.php
htdocs/index.php
2016-04-29 20:39:17 +02:00
Laurent Destailleur
0735413e7c
Merge pull request #5101 from altatof/fix_fournprice_select
...
FIX: end of select when no fournprice
2016-04-29 20:36:44 +02:00
Laurent Destailleur
04f4a99684
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-29 20:35:50 +02:00
Laurent Destailleur
3c927fbe0e
Debug website module
2016-04-29 20:35:38 +02:00
Laurent Destailleur
d7ea8139fe
Merge pull request #5103 from fappels/develop-fix-societe-update
...
Fix #5100 Develop unable to create new third party
2016-04-29 20:22:03 +02:00
BENKE Charlie
49c3c69e30
minor error code
2016-04-29 20:20:47 +02:00
Laurent Destailleur
f5df6488db
Merge pull request #5094 from defrance/patch-2
...
minor error code
2016-04-29 20:18:55 +02:00
BENKE Charlie
31a9acc77d
</option> not present in some select list
2016-04-29 20:18:26 +02:00
Laurent Destailleur
db4024035e
Merge pull request #5092 from defrance/patch-1
...
</option> not present in some select list
2016-04-29 20:17:56 +02:00
esprit libre
f5a541d469
Fix problem about unit buy price fetching
...
To fix a bug encountered at customer shop about margin calculation. In some case, returned buy price is total buy price from provider and not unit buy price.
Case opened on forum: http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/55467-calcul-des-marges
2016-04-29 19:41:47 +02:00
Laurent Destailleur
b17b30f5a2
Merge pull request #5114 from esprit-libre/develop
...
FIX When buy price not explicetly defined, it is return by defineBuyPrice function that return total price instead of unit price
2016-04-29 19:40:29 +02:00
Laurent Destailleur
5d1dbdb82c
Merge pull request #5089 from atm-maxime/fix_slect_ziptown
...
Fix country and state were not properly updated after ziptown selection
2016-04-29 19:26:40 +02:00
Laurent Destailleur
0ed998af03
Revert "Revert "FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN""
2016-04-29 19:01:38 +02:00
Laurent Destailleur
3a74946210
Revert "FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN"
2016-04-29 18:59:54 +02:00
Laurent Destailleur
ea924df4c5
Merge pull request #5080 from marcosgdf/bug-4813
...
FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN
2016-04-29 18:59:52 +02:00
Laurent Destailleur
b94295e4ca
Merge pull request #5102 from atm-alexis/3.8
...
FIX search on date into supplier invoice list
2016-04-29 18:45:04 +02:00
Laurent Destailleur
b434dad21a
Fix: remove a debug code
2016-04-29 18:34:56 +02:00
Laurent Destailleur
cea1c06f7d
Merge pull request #4764 from benlo06/fr_4763
...
FR4763 add possibility to export contacts/thirdparty categories
2016-04-29 18:33:58 +02:00
Laurent Destailleur
19162fc8d5
Merge branch 'patch-1' of https://github.com/PeartreeG/dolibarr into
...
PeartreeG-patch-1
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/resource/element_resource.php
2016-04-29 18:31:11 +02:00
Alexis Algoud
e5b6d39e51
NEW allow a document to be linked to project from another customer on config
2016-04-29 18:04:59 +02:00
Laurent Destailleur
466404d968
Fix missing dol_fiche_xxx
2016-04-29 17:58:39 +02:00
Laurent Destailleur
26b4a5a1e0
Merge pull request #4267 from bafbes/patch-12
...
allow cherry-pick of a sub-menu by changing its parent identifier
2016-04-29 17:55:29 +02:00
Laurent Destailleur
14838d222b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-29 17:53:29 +02:00
Laurent Destailleur
8fe799f424
Merge branch 'dol_resource' of https://github.com/aternatik/dolibarr
...
into aternatik-dol_resource
Conflicts:
dev/initdata/img/printcompany.png
htdocs/compta/bank/card.php
2016-04-29 17:51:11 +02:00
Laurent Destailleur
b0977e3e2a
Merge pull request #5122 from fmarcet/3.8
...
FIX: Not filtering correctly when come from dashboard
2016-04-29 17:40:03 +02:00
Laurent Destailleur
59a30cd2e7
Merge pull request #5120 from atm-maxime/fix_total_on_cabyprodserv
...
Fix wrong qty total in ca by prod/serv report
2016-04-29 17:39:40 +02:00
Laurent Destailleur
9a1cff99cc
Merge pull request #5123 from fmarcet/3.9
...
FIX: Not filtering correctly when coming from dashboard
2016-04-29 17:20:10 +02:00
Laurent Destailleur
b0b1056a44
Merge pull request #5121 from fmarcet/3.7
...
Fix: Not filtering correctly on supplier invoice's list
2016-04-29 17:19:15 +02:00
Laurent Destailleur
88842ccd8b
Merge pull request #5111 from nka11/api_improvement
...
Api improvement
2016-04-29 17:13:02 +02:00
Laurent Destailleur
bec4c58732
Merge pull request #5133 from olsesacl/develop-bug-module-cronjob
...
FIX Bug insert cronjobs in modules, default values
2016-04-29 17:11:58 +02:00
Laurent Destailleur
3c2c9a25b8
Merge pull request #5130 from frederic34/patch-9
...
FIX if type fee not specified, line is invisible and can't edit it
2016-04-29 17:11:14 +02:00
Laurent Destailleur
84a39f41d6
Merge pull request #5125 from frederic34/patch-7
...
FIX Load user personal param at login. This cause boxes disordered at login time.
2016-04-29 17:10:41 +02:00
Laurent Destailleur
f4224881c3
Merge pull request #5132 from frederic34/patch-11
...
FIX keep files attached with PROV status
2016-04-29 17:08:22 +02:00
Laurent Destailleur
8a4871323d
Merge pull request #5022 from marcosgdf/bug-5008
...
FIX #5008 SQL error when editing the reference of a supplier invoice that already exists
2016-04-29 17:01:01 +02:00
Laurent Destailleur
174cead40d
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/commande/list.php
2016-04-29 15:33:57 +02:00
Frédéric FRANCE
7e8aef037a
Update expensereport.class.php
2016-04-29 13:23:06 +02:00
Sergio Sanchis Climent
cd4e104b76
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
...
Conflicts:
htdocs/product/card.php
2016-04-29 12:39:00 +02:00
Frédéric FRANCE
a982f764fe
don't change ref if ref is not prov
2016-04-29 12:26:41 +02:00
Juanjo Menent
5ca989c836
Merge pull request #5126 from FHenry/dev_fixpgsql
...
FIX Postgres migration from 3.9 to 4.0
2016-04-29 12:18:49 +02:00
Juanjo Menent
6d58103d11
Merge pull request #5091 from marcosgdf/fr-4972
...
NEW #4972 Translated Charges sociales (type 0) and Charges sociales (type 1) in reports page
2016-04-29 12:03:04 +02:00
Juanjo Menent
206dee7106
Merge pull request #5086 from aspangaro/4.0-p23
...
NEW: Loan - Add list to select accounting account in admin
2016-04-29 12:01:44 +02:00
Juanjo Menent
08a875b813
Merge pull request #5084 from atm-maxime/new_remaintopay_invoice_list
...
New add remain to pay column in invoice list
2016-04-29 12:00:53 +02:00
Juanjo Menent
d6b1cd8a1c
Merge pull request #5083 from aspangaro/4.0-p22
...
FIX: Accountancy - Work on categories for report - Add french example & other
2016-04-29 11:59:41 +02:00
Juanjo Menent
a33df1401b
Merge pull request #5079 from marcosgdf/fix-undefined-variable
...
Fixed undefined $user variable in Account::countAccountToReconcile
2016-04-29 11:58:48 +02:00
Juanjo Menent
143a70c893
Merge pull request #5078 from atm-maxime/new_stats_on_home
...
New stats on home (contacts and interventions)
2016-04-29 11:57:44 +02:00
Juanjo Menent
9909143c42
Merge pull request #5076 from aspangaro/4.0-p21
...
FIX: For external api, don't use lengt_accountg without module accountancy activated
2016-04-29 11:55:55 +02:00
Florian HENRY
b01c7572f7
FIX travis
2016-04-29 10:21:39 +02:00
Florian HENRY
6ff71792a0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-29 09:00:42 +02:00
Sergio Sanchis Climent
61fda99fc5
FIX Bug insert cronjobs in modules, default values
2016-04-29 01:13:10 +02:00
Frédéric FRANCE
ab63bdd235
keep files attached with PROV status
2016-04-28 22:30:22 +02:00
Frédéric FRANCE
c743f6cfe5
If no project, update line is impossible
2016-04-28 21:56:28 +02:00
Frédéric FRANCE
972e5e571d
Update card.php
2016-04-28 21:52:23 +02:00
Laurent Destailleur
2ea5bf3d5e
FIX: Pre selected value was not used on supplier list ouput
2016-04-28 20:04:48 +02:00
Laurent Destailleur
0419987b6f
NEW Add view of virtual stock into product list (when appropriate)
2016-04-28 15:22:38 +02:00
Florian HENRY
b280a700d2
FIX missing column when module was installed before standard integration
2016-04-28 14:05:56 +02:00
Florian HENRY
e698c410f5
FIX Postgres migration from 3.9 to 4.0
2016-04-28 13:56:17 +02:00
Frédéric FRANCE
4404197597
Load user personal param at login
2016-04-28 11:54:42 +02:00
fmarcet
33499ae652
FIX: Compatible with multicompany
2016-04-28 11:14:00 +02:00
Sergio Sanchis Climent
32d641b66b
Bug show product if no accounting enabled
2016-04-28 11:12:04 +02:00
Laurent Destailleur
608c93702d
FIX Can't create a stock transfer from product card
2016-04-28 11:05:34 +02:00
Laurent Destailleur
e723966583
FIX: Qty in stock must be float like it is in stock movement.
...
FIX: Can't create a stock transfer from product card
Performance enhancement of stock information loading.
2016-04-28 11:01:56 +02:00
fmarcet
e96e0f637a
FIX: Not filtering correctly when come from dashboard
2016-04-28 10:41:37 +02:00
fmarcet
d599261d20
FIX: Not filtering correctly when come from dashboard
2016-04-28 10:38:50 +02:00
Florian HENRY
717eaa3d81
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/websites/class/websitepage.class.php
2016-04-28 10:32:31 +02:00
Ferran Marcet
7380676717
Fix: Not filtering correctly on supplier invoice's list
2016-04-28 10:25:55 +02:00
Maxime Kohlhaas
0a67614e72
Fix wrong qty total in ca by prod/serv report
2016-04-28 09:10:22 +02:00
nka11
b03199606a
Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into restler3.0.0RC6
2016-04-28 08:34:18 +02:00
nka11
932b9837fe
Merge branch 'fix_5053' into api_improvement
2016-04-28 08:31:10 +02:00
nka11
ce0436b809
Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into fix_5053
2016-04-28 08:30:33 +02:00
BENKE Charlie
8a63298102
Missing addMoreActionsButtons hook
2016-04-27 22:19:38 +02:00
BENKE Charlie
520facd55e
Missing addMoreActionsButtons hook
2016-04-27 22:17:45 +02:00
Laurent Destailleur
aa31a7e9c5
Finished list of template invoices
2016-04-27 20:09:55 +02:00
Laurent Destailleur
7608366e70
Fix pagination
2016-04-27 19:34:38 +02:00
Laurent Destailleur
9987c9b77a
Can sort on field of recurring invoices
2016-04-27 17:36:05 +02:00
Laurent Destailleur
7770d95b18
FIX PHPCS
2016-04-27 16:56:09 +02:00
fappels
65ea83fa06
NEW prepare for additional warehouse statuses
...
Add additional warehouse statuses, so you can add extra filter
possibility. For example hide warehouses with damaged stock from
shipping. Feature is still hidden by conf ENTREPOT_EXTRA_STATUS
Still TODO: config all $formproduct->selectWarehouses
2016-04-27 16:51:51 +02:00
esprit libre
75a9178549
Fix problem about unit buy price fetching
...
To fix a bug encountered at customer shop about margin calculation. In some case, returned buy price is total buy price from provider and not unit buy price.
Case opened on forum: http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/55467-calcul-des-marges
2016-04-27 16:42:59 +02:00
Laurent Destailleur
39bc4d5f02
Optimize load_stock and load_stock_virtual
2016-04-27 14:19:06 +02:00
Laurent Destailleur
c6371060d0
FIX Stock limit for alert added into list of available fields for stock
2016-04-27 14:05:35 +02:00
Laurent Destailleur
810a6c2cb4
Better explanation
2016-04-27 13:39:54 +02:00
Laurent Destailleur
77fcbd3884
FIX: init var at wrong place report incorrect "shippable" flag on draft
...
order.
2016-04-27 12:34:52 +02:00
Laurent Destailleur
2beb16ef32
Remove limit on product ref on replenishment
2016-04-27 12:30:36 +02:00
Laurent Destailleur
bb91fb174b
FIX: init var at wrong place report incorrect "shippable" flag on draft
...
order.
2016-04-27 12:30:00 +02:00
Laurent Destailleur
60e693e9a4
Minor fixes on recurring invoices
2016-04-27 11:35:11 +02:00
Laurent Destailleur
bdb7fe8d29
Missing public note on recurring invoices
...
Can change position of lines in recurring invoices
2016-04-27 11:07:20 +02:00
Laurent Destailleur
11217db8c4
FIX: when creating project from template/recurring invoice creation, we
...
lost information we were working in template/recurring invoice.
2016-04-27 10:56:40 +02:00
nka11
19e223e84b
Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into api_improvement
2016-04-27 09:43:00 +02:00
Florian HENRY
1d75c5f720
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/class/commonobject.class.php
2016-04-27 09:41:42 +02:00
Florian HENRY
bfbb1c20bc
FIX bug on email template
2016-04-27 09:27:59 +02:00
nka11
98f757a87a
New API methods
...
add user to group
get product list by category id
2016-04-27 08:59:12 +02:00
Laurent Destailleur
78cda5dc07
Fix problem with code of reccuring invoices
2016-04-26 22:00:41 +02:00
Florian HENRY
b82a216879
fix confilct
2016-04-26 14:21:40 +02:00
Florian HENRY
8d91523619
NEW : Enabled feature hidden extrafeilds
2016-04-26 14:17:20 +02:00
Florian HENRY
c7a9f26ee5
NEW : continue hidden extrafield feature
2016-04-26 14:17:19 +02:00
Laurent Destailleur
56b57b0bc9
Code comment
2016-04-26 13:37:09 +02:00
Laurent Destailleur
66ea799eb7
Uniformize code and add more comment to understand workflow
2016-04-26 13:27:32 +02:00
Laurent Destailleur
714b5556f3
FIX if qty to ship is < 0, we sugest 0
2016-04-26 13:13:18 +02:00
Laurent Destailleur
4758c82d41
Solve minor translation
2016-04-26 09:45:19 +02:00
nka11
c8432fcccd
Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into restler3.0.0RC6
2016-04-26 07:37:58 +02:00
nka11
56d25a7c2b
Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into fix_5053
2016-04-26 07:31:00 +02:00
Alexis Algoud
91bea8b9fe
fix inclusion
2016-04-25 18:54:28 +02:00
Alexis Algoud
bf1f805bf6
FIX trad
2016-04-25 18:40:38 +02:00
Alexis Algoud
b46c14812c
Merge branch 'NEW_decrease_stock_expedition_classify' of github.com:atm-alexis/dolibarr into develop
2016-04-25 18:37:47 +02:00
Alexis Algoud
b472a244db
NEW decrease stock on expedition closing/classifying
2016-04-25 18:33:39 +02:00
Alexis Algoud
7658a86bc9
NEW show detail per warehouse into reassort
2016-04-25 15:34:54 +02:00
Francis Appels
11c31667b8
Update product.class.php
...
Fix updatePrice syslog.
Is travis still running phpunit tests?
2016-04-25 15:04:33 +02:00
fappels
6bf52558e4
Fix #5100 Develop unable to create new third party
...
Only set fk_stcomm if available
Do not set 'null' into float databasefield
2016-04-25 12:13:28 +02:00
Christophe Battarel
2a0c508d47
FIX: end of select when no fournprice
2016-04-25 11:26:13 +02:00
Alexis Algoud
1746f8f96c
FIX search on date into supplier invoice list dont work because of status -1
2016-04-25 11:25:49 +02:00
Laurent Destailleur
c73f4e5d7b
FIX Project was lost when creating invoice from a template
...
Can set project on invoice during creation of invoice from a template
Replace duplicated code to show lines with mutualized code
2016-04-24 20:00:00 +02:00
Laurent Destailleur
ccdbf69cd5
Bette explanation on how to create an repeatable invoice
2016-04-24 18:11:19 +02:00
aspangaro
d0b2068ab1
FIX: Accountancy - Upgrade Cegid Bank export
2016-04-24 14:41:14 +02:00
Maxime Kohlhaas
02aa3f5688
Debug double conf
2016-04-24 12:14:03 +02:00
nka11
8b92e552a3
fix #5053 and bogus 051c5f4
2016-04-24 09:55:19 +02:00
aspangaro
f5c1406beb
FIX: Accountancy - Fix on bank journal to support subcription
2016-04-24 06:10:15 +02:00
BENKE Charlie
dde4f7ed85
minor error code
2016-04-24 02:01:29 +02:00
Laurent Destailleur
bcb4b2b607
Work on website module
2016-04-23 21:34:10 +02:00
BENKE Charlie
961c086be3
</option> not present in some select list
2016-04-23 20:17:45 +02:00
Marcos García de La Fuente
82ee964c27
NEW #4972 Translated Charges sociales (type 0) and Charges sociales (type 1) in reports page
...
Close #4972
2016-04-23 18:22:11 +02:00
Maxime Kohlhaas
651213123f
Oups missing $conf
2016-04-23 17:45:38 +02:00
Maxime Kohlhaas
2c6f58e689
Add choices in PDF admin page
2016-04-23 17:37:12 +02:00
Maxime Kohlhaas
930b4a9be0
New var name
2016-04-23 17:36:55 +02:00
Laurent Destailleur
1a883d870b
Uniformize style
2016-04-23 17:35:33 +02:00
Maxime Kohlhaas
ad26fb2824
New option to show details in pdf page foot
2016-04-23 17:23:44 +02:00
Maxime Kohlhaas
0358db0065
Fix use of details in pdf foot
2016-04-23 17:10:56 +02:00
Laurent Destailleur
9d21b63562
Beautify a page
2016-04-23 16:55:08 +02:00
Laurent Destailleur
00a658143d
NEW List of user in agenda view per user show photo thumb
2016-04-23 16:51:22 +02:00
Maxime Kohlhaas
179022b129
Fix country and state were not properly updated after ziptown selection
2016-04-23 16:49:43 +02:00
aspangaro
c652d5b02d
NEW: Loan - Add list to select accounting account in admin
2016-04-23 16:06:33 +02:00
Maxime Kohlhaas
c5787a4bba
New add remain to pay column in invoice list (was present in previous versions)
2016-04-23 16:02:18 +02:00
aspangaro
1454f5cafa
FIX: Accountancy - Table account integer 0 by default
2016-04-23 15:44:31 +02:00
aspangaro
04fd5a20ef
FIX: Accountancy Work on categories for Report - Add french example
2016-04-23 15:43:28 +02:00
Laurent Destailleur
b639849a47
Page for proposals must be called card.php (one of last architecture
...
change before the freeze)
2016-04-23 15:37:22 +02:00
Marcos García de La Fuente
d98e50e661
Little change
2016-04-23 13:44:43 +02:00
Marcos García de La Fuente
867649e922
FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN
...
Close #4813
2016-04-23 13:36:12 +02:00
Marcos García de La Fuente
f195107bd1
Fixed undefined $user variable in Account::countAccountToReconcile
2016-04-23 13:25:23 +02:00
Maxime Kohlhaas
4e42e73f60
New add stats on interventions
2016-04-23 13:16:19 +02:00
Maxime Kohlhaas
df4d016684
New add stats on contacts
2016-04-23 13:06:46 +02:00
aspangaro
2a7c7a0748
Same problem on bank
2016-04-23 08:09:38 +02:00
aspangaro
8f9c3f96cf
Merge remote-tracking branch 'Upstream/develop' into 4.0-p21
2016-04-23 07:07:15 +02:00
aspangaro
a8aeba3ade
FIX: For external api, don't use lengt_accountg without module accountancy activated
2016-04-23 07:05:16 +02:00
Laurent Destailleur
5bfc65676c
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
ChangeLog
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
htdocs/theme/eldy/style.css.php
2016-04-22 21:02:20 +02:00
Laurent Destailleur
3278c8245b
Merge pull request #5020 from frederic34/swiftmailer
...
Add Swift Mailer to send mails
2016-04-22 20:12:58 +02:00
Laurent Destailleur
361bba4eb2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-22 20:01:14 +02:00
Laurent Destailleur
051c5f415e
Fix API access protection check #5053
2016-04-22 20:00:37 +02:00
Laurent Destailleur
284622edbd
Merge pull request #5062 from bafbes/abb-18
...
fix:missing quote in query in commonobject updatefield function
2016-04-22 19:51:11 +02:00
Laurent Destailleur
3d4ddcb29e
Merge pull request #5065 from atm-maxime/fix_supplier_order_log
...
Fix log function was removed in 1b6fa8ec34
2016-04-22 19:45:36 +02:00
Laurent Destailleur
230807b292
Merge pull request #5056 from frederic34/patch-10
...
FIX If oauth has never been activated two tables are missing and printing is not working
2016-04-22 19:42:21 +02:00
Laurent Destailleur
7e047ada2b
Merge pull request #5064 from aspangaro/4.0-p21
...
FIX: Accountancy - Road to stable version
2016-04-22 19:21:18 +02:00
Laurent Destailleur
63d04f4f2d
Merge pull request #5066 from atm-maxime/fix_thirdparty_instead_client
...
Fix order creation bug because of ->client
2016-04-22 19:20:48 +02:00
Laurent Destailleur
fb53b41078
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-22 19:20:04 +02:00
Laurent Destailleur
da14f247bb
Merge pull request #5070 from atm-maxime/fix_display_payment_on_invoices
...
Fix payment display on customer invoice and replicate on supplier inv…
2016-04-22 19:19:46 +02:00
Laurent Destailleur
031bcb41e3
Merge pull request #5073 from atm-maxime/fix_menu_bank
...
Fix bank submenu error
2016-04-22 19:13:53 +02:00
Laurent Destailleur
ec407af81a
Merge pull request #5072 from atm-maxime/fix_bank_releve_display
...
Fix bank statement display
2016-04-22 19:12:56 +02:00
Laurent Destailleur
bcc0f0c488
Merge pull request #5067 from grandoc/develop
...
Fix : missing translation
2016-04-22 19:12:36 +02:00
Laurent Destailleur
4958c13691
Merge pull request #5069 from atm-maxime/new_contact_gender
...
New contact gender according to civility
2016-04-22 19:11:54 +02:00
Laurent Destailleur
0a55534da8
Merge pull request #5059 from frederic34/patch-7
...
Update 3.9.0-4.0.0.sql
2016-04-22 19:08:04 +02:00
Laurent Destailleur
bfc5be1aad
FIX Fix and move dolGetFirstLine function into main
...
FIX Hang on ->client not defined
2016-04-22 19:07:32 +02:00
Laurent Destailleur
467662143f
Merge pull request #5046 from bafbes/abb-17
...
fix:use of function updateExtrafield instead of insertExtrafields in interventions
2016-04-22 18:31:14 +02:00
Laurent Destailleur
1de36d6501
Merge pull request #5011 from altatof/supplierorder_noprice
...
NEW hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED
2016-04-22 18:27:42 +02:00
Laurent Destailleur
241e765829
Merge pull request #5047 from hregis/3.9_bug
...
Fix: broken multicompany transverse mode authentication feature
2016-04-22 18:24:17 +02:00
Laurent Destailleur
a99b7ddee6
Fix PHPCS
2016-04-22 18:12:31 +02:00
Laurent Destailleur
0ef1be9364
Prepare 3.9.1
2016-04-22 18:07:34 +02:00
Laurent Destailleur
25b7f0ab62
FIX Remove a total that has no sense
2016-04-22 17:11:12 +02:00
Laurent Destailleur
2cc24db6a2
Fix typo
2016-04-22 13:45:54 +02:00
Laurent Destailleur
c939273fd5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-22 13:38:56 +02:00
Laurent Destailleur
366db31a9e
Make css more simple
2016-04-22 13:38:44 +02:00
Laurent Destailleur
7515b2ba7b
NEW Add a parameter on graph function to show a generic graph when no
...
data are available.
2016-04-22 12:11:57 +02:00
Maxime Kohlhaas
72ef11f593
Fix bank submenu error
2016-04-22 11:59:55 +02:00
Maxime Kohlhaas
5904f33039
Fix bank statement display
2016-04-22 11:44:23 +02:00
Laurent Destailleur
ff5f04dee1
Removed not required directories
2016-04-22 11:11:24 +02:00
Laurent Destailleur
78d18185e4
Several css enhancements
2016-04-22 11:11:08 +02:00
Laurent Destailleur
d735f5dc70
FIX lost css change
2016-04-22 11:10:20 +02:00
Laurent Destailleur
a10d97cce0
NEW Can filter on status employee when building emailing from users
2016-04-22 11:09:31 +02:00
Maxime Kohlhaas
fc7056650e
Fix payment display on customer invoice and replicate on supplier invoice
2016-04-22 10:42:06 +02:00
Maxime Kohlhaas
7dd8eba29e
New contact gender according to civility
2016-04-22 10:30:13 +02:00
Maxime Kohlhaas
e881701968
Fix pdf generation with thirdparty
2016-04-22 09:46:47 +02:00
philippe grand
0c7d7245a8
missing translation
2016-04-22 09:37:35 +02:00
Maxime Kohlhaas
4bd239060c
Fix order creation bug because of ->client
2016-04-22 09:18:09 +02:00
Maxime Kohlhaas
bea8b49d8c
Fix log function was removed in 1b6fa8ec34
2016-04-22 09:02:40 +02:00
aspangaro
df91a95b9b
FIX: Add right to manage chart of accounts for non-admin
2016-04-22 07:05:24 +02:00
aspangaro
24fddaa039
Hidden old functions
2016-04-22 06:58:18 +02:00
aspangaro
4a078db060
FIX: Migration script
2016-04-22 06:57:37 +02:00
aspangaro
8f3a254259
FIX: Bug with category functionnality
2016-04-22 06:31:40 +02:00
abb
a0f57e6a91
fix:add escape function to query in updatefield function
2016-04-21 14:49:46 +01:00
abb
4406cfcbb8
fix:missing quote in query in updatefield function
2016-04-21 14:32:51 +01:00
Frédéric FRANCE
adde434708
Update 3.9.0-4.0.0.sql
2016-04-21 08:52:10 +02:00
Philippe-OpenDSI
2fc876f607
FIX #5048 Product supplier list display only one produc
...
Last parameter of select_produits_fournisseurs_list is $limit, not $socid
2016-04-21 08:41:45 +02:00
nka11
b60389cec4
Update Restler to 3.0.0RC6
2016-04-21 08:13:19 +02:00
Frédéric FRANCE
fd9fb505b9
Update printgcp.modules.php
2016-04-21 07:53:22 +02:00
Laurent Destailleur
2d558174f2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-21 03:19:07 +02:00
Laurent Destailleur
c2de7adb32
Minor PHPCS fixes
2016-04-21 03:18:42 +02:00
Laurent Destailleur
7adf3a4789
Merge pull request #5043 from bafbes/abb-15
...
new function updateExtraField to update one particular extrafield
2016-04-21 02:58:39 +02:00
Laurent Destailleur
bcbffe3a4a
Merge pull request #5037 from frederic34/patch-9
...
Update style.css.php
2016-04-21 02:54:07 +02:00
Laurent Destailleur
d9e846e586
Update migrate script
2016-04-21 02:47:34 +02:00
Laurent Destailleur
dd443fe7f5
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/compta/localtax/quadri_detail.php
2016-04-21 02:42:43 +02:00
Laurent Destailleur
8a6d97f257
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-21 02:39:37 +02:00
Laurent Destailleur
ffd10a7560
Complete function loadExpedition to add filter on fk_product
2016-04-21 02:38:49 +02:00
Laurent Destailleur
d347595d86
Merge pull request #5041 from aspangaro/4.0-p20
...
FIX: Accounting library already declared in line 54
2016-04-21 01:57:44 +02:00
placid0w
d043c9ce80
Fix #5054
2016-04-21 01:56:36 +02:00
Philippe-OpenDSI
e3e2b87506
Product supplier list display only one product
...
Last parameter of select_produits_fournisseurs_list is $limit, not $socidif
2016-04-21 01:55:35 +02:00
Laurent Destailleur
b032280d07
Merge pull request #5049 from philippe-opendsi/develop
...
FIX #5048 Product supplier list display only one product
2016-04-21 01:54:36 +02:00
Laurent Destailleur
ff140914c8
Merge pull request #5050 from FHenry/3.9
...
FIX : When cloning an order the order result from clone must be now
2016-04-21 01:50:15 +02:00
Laurent Destailleur
1e5ff7388c
Merge pull request #5031 from marcosgdf/refactor-deprecated-co-client
...
NEW Removed deprecated CommonObject::client property
2016-04-21 01:49:12 +02:00
Laurent Destailleur
533391f846
Merge pull request #5030 from frederic34/patch-7
...
FIX Using $user that was not imported
2016-04-21 01:25:59 +02:00
Laurent Destailleur
429be4678c
Merge pull request #5045 from bafbes/abb-16
...
fix:erroneous nesting form
2016-04-21 01:23:37 +02:00
Laurent Destailleur
3ba87be4ef
Merge pull request #5029 from marcosgdf/deprecated-functions
...
NEW Deprecated Societe::set_prospect_level, Societe::set_commnucation_level, Societe::set_OutstandingBill functions
2016-04-21 01:18:22 +02:00
Laurent Destailleur
4b401a03c8
Merge pull request #5028 from marcosgdf/fr-4524
...
NEW Renamed ActionComm::add function to ActionComm::create
2016-04-21 01:16:46 +02:00
Laurent Destailleur
30f7d4cd52
Merge pull request #5027 from marcosgdf/refactor-option
...
Refactored Form classes to use Form::selectarray instead of HTML code
2016-04-21 01:15:59 +02:00
Frédéric FRANCE
e1d55d280e
Update printgcp.modules.php
2016-04-20 22:29:27 +02:00
placid0w
7bf9c2144e
Fix #5054
2016-04-20 15:43:14 -03:00
Florian HENRY
79f408feeb
FIX : When cloning an order the order result from clone must be now
2016-04-20 17:17:03 +02:00
Philippe-OpenDSI
c298b783ce
Product supplier list display only one product
...
Last parameter of select_produits_fournisseurs_list is $limit, not $socidif
2016-04-20 13:59:13 +02:00
Laurent Destailleur
fb5497f3d6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-19 19:52:37 +02:00
Laurent Destailleur
6d2df1f6ea
Merge pull request #5007 from altatof/fichinter_order_by_date
...
NEW: fichinter lines ordered by rang AND DATE
2016-04-19 19:26:57 +02:00
Laurent Destailleur
349c1c2d69
Merge pull request #4999 from fappels/develop
...
Fix migration script
2016-04-19 19:22:37 +02:00
Laurent Destailleur
0c932e0ee6
Merge pull request #4997 from atm-maxime/fix_vat_on_credit_note
...
Fix VAT amount on credit note was > 0 when manually entered
2016-04-19 19:21:05 +02:00
Laurent Destailleur
39c68c302e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-19 19:15:55 +02:00
Laurent Destailleur
08c379ad58
Fix submit photo is no more hidden on smartphone.
2016-04-19 19:15:31 +02:00
Laurent Destailleur
005751f330
Merge pull request #4963 from altatof/add_filter_type_on_turnover_report
...
NEW: add product type filter on turnover report
2016-04-19 19:15:04 +02:00
Laurent Destailleur
da329131bb
Merge pull request #4959 from nka11/api_dev
...
API Improvements
2016-04-19 19:13:57 +02:00
Laurent Destailleur
d40e659b30
Merge pull request #4858 from marcosgdf/oop-refactor-bankaccount-tostring
...
NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown
2016-04-19 19:11:54 +02:00
Laurent Destailleur
4619040983
Work on website module
2016-04-19 18:41:05 +02:00
frederic34
1a552cbd16
typo
2016-04-19 18:27:56 +02:00
Regis Houssin
0a52abab5d
Fix: broken multicompany transverse mode authentication feature
2016-04-19 13:38:32 +02:00
Fixit Management
c3a5a7aab8
Rollback modification in this file
2016-04-19 12:54:46 +02:00
Fixit Management
ee9f1f32c1
Update conf
2016-04-19 12:43:50 +02:00
Fixit Management
5778ba0bd8
Merge remote-tracking branch 'upstream/develop' into fr_4763
2016-04-19 12:31:05 +02:00
abb
c77e121553
fix:use of function updateExtrafield instead of insertExtrafields in interventions
2016-04-19 08:17:57 +01:00
abb
e673c1aad9
fix:erroneous nested form
2016-04-19 08:08:35 +01:00
abb
62aa628524
fixmycommit:new function updateExtraField to update one particular extrafield
2016-04-19 07:49:05 +01:00
abb
f0f4933905
new function updateExtraField to update one particular extrafield
...
Conflicts:
htdocs/core/class/commonobject.class.php
2016-04-19 07:47:29 +01:00
aspangaro
bb554a73bd
FIX: Accounting library already declared in line 54
2016-04-19 06:18:34 +02:00
Laurent Destailleur
cb1772b527
Fix too much code removed. We still need JQUERY LAYOUT for ECM module.
2016-04-19 01:45:45 +02:00
Laurent Destailleur
448ca49e28
Fix bad field
2016-04-18 21:10:30 +02:00
Laurent Destailleur
3a807d9cdb
Revert a commit. The field was already added.
2016-04-18 21:07:26 +02:00
Laurent Destailleur
a88b3a8cc4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-18 21:02:34 +02:00
Laurent Destailleur
f68f5677bb
Start to use the vat code to identify a vat into combo list instead of
...
just "rate" and "npr".
2016-04-18 21:02:14 +02:00
Juanjo Menent
5a87218622
Merge pull request #5034 from aspangaro/4.0-p19
...
NEW: Accountancy - Add Result page
2016-04-18 20:17:27 +02:00
Juanjo Menent
b236612975
Merge pull request #5038 from frederic34/patch-10
...
Update 3.9.0-4.0.0.sql
2016-04-18 20:15:17 +02:00
Juanjo Menent
48407da37b
Merge pull request #5039 from frederic34/patch-11
...
Update rappro.php
2016-04-18 20:14:44 +02:00
nka11
39948968eb
Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into api_dev
2016-04-18 19:13:06 +02:00
nka11
4eb1aa59aa
fix coding rules
2016-04-18 19:11:28 +02:00
Frédéric FRANCE
18b3b3a31d
Update rappro.php
2016-04-18 08:14:02 +02:00
Frédéric FRANCE
c6226e63b7
Update 3.9.0-4.0.0.sql
2016-04-18 08:13:01 +02:00
Frédéric FRANCE
3db34a723d
Update style.css.php
2016-04-18 00:55:12 +02:00
frederic34
60ebc6fa11
Some correction for testconnect
2016-04-18 00:47:08 +02:00
Frédéric FRANCE
09528cccaf
Update printsheet.php
2016-04-17 19:14:48 +02:00
aspangaro
19b594ee9d
Correct travis
2016-04-17 15:58:32 +02:00
aspangaro
b59c94e056
NEW: Accountancy - Add Result page
...
& review
2016-04-17 15:44:04 +02:00
Marcos García de La Fuente
e2c86d3fd8
NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead
2016-04-17 15:24:22 +02:00
Marcos García de La Fuente
54dd1763fe
Little refactor
2016-04-17 15:05:54 +02:00
Frédéric FRANCE
d5980a5bf8
Update html.formmail.class.php
2016-04-17 12:20:45 +02:00
frederic34
75127638a4
Embed images
2016-04-17 10:28:21 +02:00
frederic34
8428b791f8
Add logger to dump smtp dialog
2016-04-16 22:25:47 +02:00
Marcos García de La Fuente
21ba24a0cd
NEW Deprecated Societe::set_prospect_level, Societe::set_commnucation_level, Societe::set_OutstandingBill functions
2016-04-16 22:13:55 +02:00
Marcos García de La Fuente
84b58d27e6
NEW Renamed ActionComm::add function to ActionComm::create
2016-04-16 21:41:06 +02:00
Marcos García de La Fuente
863efcbc5d
NEW Removed unused FormOrder::selectSourcesCommande function
...
Also refactored select functions to avoid using HTML and encourage using Form::selectarray function
2016-04-16 21:33:23 +02:00
Marcos García de La Fuente
3722fc1014
Refactored FormVentilation class
2016-04-16 20:16:38 +02:00
Marcos García de La Fuente
aa64266c2f
FIX #5008 SQL error when editing the reference of a supplier invoice that already exists
...
Close #5008
2016-04-16 18:44:31 +02:00
frederic34
567dc1734e
Add Swift Mailer to send mails
2016-04-16 18:15:03 +02:00
appchecker
bc949cafd2
fix: comparing instead of assign
2016-04-16 13:39:55 +03:00
Juanjo Menent
a2b680aa5a
Merge remote-tracking branch 'upstream/develop' into develop
2016-04-15 18:08:12 +02:00
Juanjo Menent
b7d36da74f
Merge pull request #5006 from atm-maxime/new_banklink_withdraw
...
New add link to widthdraw slip card on bank transaction
2016-04-15 18:07:33 +02:00
Juanjo Menent
ecbf5996c1
FIX #4961
2016-04-15 17:20:37 +02:00
Juanjo Menent
f86952dfaa
FIX Add missing field fk_shipping_method_id
2016-04-15 16:57:11 +02:00
Juanjo Menent
b5f7f962cc
FIX Travis fails
2016-04-15 16:05:47 +02:00
Juanjo Menent
9f4ccfab95
FIX #3815 With higher quality
2016-04-15 15:54:51 +02:00
Juanjo Menent
c5ecc46a22
FIX #3815 With higher quality
2016-04-15 15:42:58 +02:00
Juanjo Menent
bff1ec2d80
Merge remote-tracking branch 'upstream/3.9' into develop
2016-04-15 13:49:59 +02:00
Juanjo Menent
8751f6cfa0
Merge pull request #4998 from FHenry/3.9
...
FIX Hook resprint must be printed
2016-04-15 13:05:40 +02:00
Juanjo Menent
4446e6a36c
FIX #3815 Call to undefined function local_by_date(). branch 3.8
2016-04-15 12:47:21 +02:00
Christophe Battarel
ec5e0e5290
forgot one line
2016-04-15 12:32:36 +02:00
Christophe Battarel
c3d4cd85f1
NEW hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED allow supplier
...
order even if no supplier price defined
2016-04-15 12:28:35 +02:00
Juanjo Menent
2d3b2c08b5
FIX #3815 Call to undefined function local_by_date(). branch 3.7
2016-04-15 10:56:03 +02:00
Christophe Battarel
1676595b93
NEW: fichinter lines ordered by rang AND DATE
2016-04-14 10:50:32 +02:00
Maxime Kohlhaas
9de6d31c87
New add link to widthdraw slip card on bank transaction
2016-04-13 15:57:46 +02:00
Laurent Destailleur
e1d35c2797
Fix waarnings
2016-04-12 19:29:32 +02:00
Laurent Destailleur
87702f89fc
Work on website module
2016-04-12 19:17:50 +02:00
Laurent Destailleur
df8bbaee34
Add icone for website module
2016-04-12 18:24:35 +02:00
fappels
2462716eb4
Fix migration script
2016-04-12 16:24:00 +02:00
Laurent Destailleur
8d46d76f96
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/facture/paiement.php
2016-04-12 15:05:18 +02:00
Laurent Destailleur
e61c83d708
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/fourn/facture/paiement.php
2016-04-12 15:03:19 +02:00
Laurent Destailleur
8342a61ea9
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/fourn/facture/card.php
htdocs/product/composition/card.php
2016-04-12 15:00:02 +02:00
Laurent Destailleur
fedcad31e0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/admin/multicurrency.php
2016-04-12 14:47:16 +02:00
Laurent Destailleur
357877b1fe
Debug multicurrency and clean properties of some modules
2016-04-12 14:45:59 +02:00
Laurent Destailleur
7ce82aaf16
Removed hidden option MAIN_MENU_USE_JQUERY_LAYOUT. This feature will be
...
implemented with pure CSS/Jquery so no more need of not maintained
external library.
2016-04-12 13:38:41 +02:00
Laurent Destailleur
56c64f22be
Prepare menu icon to hide/show left menu
2016-04-12 13:30:47 +02:00
Florian HENRY
872c99afe9
FIX Hook resprint be printed
2016-04-12 11:35:39 +02:00
Maxime Kohlhaas
25dcca301f
Fix VAT amount on credit note was > 0 when manually entered
2016-04-12 09:47:35 +02:00
Christophe Battarel
0dd25a7e70
add new filter in GROUP BY clause
2016-04-12 09:39:48 +02:00
nka11
9ced1dc008
fixing some style and renaming Account to User API
2016-04-11 23:27:43 +02:00
nka11
e5a447c148
Adding more line features (PUT, DELETE, POST)
2016-04-11 22:41:35 +02:00
Laurent Destailleur
b71c6a8a54
Merge pull request #4800 from atm-ph/new_multicurrency_sync_rates
...
New multicurrency sync rates
2016-04-11 19:20:59 +02:00
Laurent Destailleur
d0e3d9db76
Merge pull request #4992 from altatof/fix_minimum_buying_price
...
FIX: correct display of minimum buying price
2016-04-11 19:17:09 +02:00
Laurent Destailleur
fabeb37b65
Merge pull request #4990 from FHenry/3.9
...
FIX #4989
2016-04-11 19:09:46 +02:00
Laurent Destailleur
3127432a4d
Merge pull request #4987 from marcosgdf/bug-4874
...
FIX #4874 SQL error when listing users
2016-04-11 19:08:56 +02:00
Laurent Destailleur
4d14f3e6f2
Merge pull request #4983 from marcosgdf/bug-4442
...
FIX #4442 Missing translation in Banks menu
2016-04-11 18:59:03 +02:00
Laurent Destailleur
46dd3c0cec
Merge pull request #4982 from marcosgdf/bug-4737
...
FIX #4737 Bank transacion type selector translation is cropped
2016-04-11 18:58:26 +02:00
Laurent Destailleur
b60e90a7b7
NEW A module can add, into its import profiles, a sql request to execute
...
at end of import. This allow to update dernormalized data after import.
2016-04-11 18:08:03 +02:00
nka11
1fdcd0e859
Fixed bugs in order api. Added method for posting new lines in order
2016-04-11 18:07:02 +02:00
Christophe Battarel
292373cf84
forgot new discount field
2016-04-11 17:43:10 +02:00
Christophe Battarel
983b2c9a21
FIX: real min buying price
2016-04-11 17:40:47 +02:00
Christophe Battarel
791df0c9ea
FIX: correct display of minimum buying price
2016-04-11 17:27:34 +02:00
Laurent Destailleur
3678e05270
Mutualize code by moving getter into parent class.
2016-04-11 16:36:00 +02:00
Laurent Destailleur
03f43d7c55
Removed a TODO by moving detection of line of records of a file to
...
import into the import driver.
2016-04-11 15:19:58 +02:00
Laurent Destailleur
0e7fb80a34
FIX: We should be able to import value '0'
2016-04-11 14:56:42 +02:00
Florian HENRY
8035742779
FIX fetchAllEMailTemplate
2016-04-11 14:52:22 +02:00
Laurent Destailleur
695cccca1c
Import wizard accept both id or ref into imported fields. But if the ref
...
is numeric, there is no way to know if it is a ref or id. So i introduct
support of syntax id: or ref: into value of field to import to force
type.
2016-04-11 14:44:14 +02:00
Florian HENRY
23bb2eaf8a
remove debug
2016-04-11 14:27:17 +02:00
Florian HENRY
b7275edfb8
FIX #4989
2016-04-11 14:24:31 +02:00
Laurent Destailleur
9f019a0ec3
Debug supplier proposal module
2016-04-10 20:50:55 +02:00
nka11
11292410e9
Fix coding style errors
2016-04-10 14:23:29 +02:00
nka11
132cdd9ed4
Fix coding style errors
2016-04-10 14:15:38 +02:00
nka11
65e4273fdf
Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into api_dev
2016-04-10 14:00:00 +02:00
nka11
cea87dccbb
crlf fix
2016-04-10 13:59:52 +02:00
nka11
d0356d6bd0
new api class for accounts, filtering on order api
2016-04-10 13:57:53 +02:00
Juanjo Menent
f25bf64257
Merge pull request #4978 from marcosgdf/bug-4851
...
FIX #4851 Project selector in supplier invoices shows the project label twice
2016-04-10 12:41:08 +02:00
Juanjo Menent
ddb1d06ad4
Merge pull request #4980 from marcosgdf/3.8
...
FIX #4743 UI glitch in project summary page
2016-04-10 11:56:37 +02:00
Juanjo Menent
e27def479f
Merge pull request #4986 from marcosgdf/bug-4747
...
FIX #4747 Missing UI background when registering a supplier invoice payment
2016-04-10 11:54:27 +02:00
Juanjo Menent
be0b7c86ff
Merge pull request #4985 from marcosgdf/bug-4742
...
FIX #4742 Able to delete a supplier invoice with a registered payment
2016-04-10 11:52:21 +02:00
Juanjo Menent
c3472f7879
Merge pull request #4984 from marcosgdf/bug-4424
...
FIX #4424 Missing email of user popup in supplier orders area
2016-04-10 11:51:36 +02:00
Juanjo Menent
4f5d96150a
Merge pull request #4977 from marcosgdf/bug-4766
...
FIX #4766 VAT not shown in supplier invoice popup
2016-04-10 11:42:29 +02:00
Marcos García de La Fuente
7acbf1dd92
FIX #4874 SQL error when listing users
...
Close #4874
2016-04-10 01:00:27 +02:00
Marcos García de La Fuente
15d9273751
FIX #4747 Missing UI background when registering a supplier invoice payment
...
Close #4747
2016-04-10 00:30:31 +02:00
Marcos García de La Fuente
af473df214
FIX #4742 Able to delete a supplier invoice with a registered payment
...
Close #4742
2016-04-09 23:29:19 +02:00
Marcos García de La Fuente
a41a80b8fe
Merge branch 'develop' into oop-refactor-bankaccount-tostring
2016-04-09 23:17:09 +02:00
Marcos García de La Fuente
865f9defff
FIX #4424 Missing email of user popup in supplier orders area
...
Close #4424
2016-04-09 23:08:47 +02:00
Marcos García de La Fuente
b9de3d5852
FIX #4442 Missing translation in Banks menu
...
Close #4442
2016-04-09 23:03:00 +02:00
Marcos García de La Fuente
3135cf720d
FIX #4737 Bank transacion type selector translation is cropped
...
Close #4737
2016-04-09 22:59:12 +02:00
Marcos García de La Fuente
7cc1288bb2
FIX #4743 UI glitch in project summary page
...
Close #4743
2016-04-09 22:54:34 +02:00
Marcos García de La Fuente
1026484da1
FIX #4748 Supplier invoice payment confirmation amount is not translated
...
Close #4748
2016-04-09 22:48:42 +02:00
Marcos García de La Fuente
b2f922291f
FIX #4851 Project selector in supplier invoices shows the project label twice
...
Close #4851
2016-04-09 22:38:58 +02:00
Marcos García de La Fuente
9169adf4ce
FIX #4766 VAT not shown in supplier invoice popup
...
Close #4766
2016-04-09 22:34:55 +02:00
phf
a33472942d
Fix synchronize rates for multicurrency module
2016-04-09 22:12:33 +02:00
nka11
5967330004
merge api_customer to api_ thirdparty
2016-04-09 21:39:12 +02:00
Laurent Destailleur
63dd6d98ec
Remove warnings
2016-04-09 19:53:16 +02:00
Laurent Destailleur
af4a975be2
Fix PHPCS
2016-04-09 19:50:13 +02:00
Laurent Destailleur
acf546d982
Move a not used function into a better place.
2016-04-09 19:42:34 +02:00
Laurent Destailleur
d395e8b85e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-09 19:36:48 +02:00
Scrutinizer Auto-Fixer
051ccf30a1
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-04-09 17:32:05 +00:00
Laurent Destailleur
dd1f946afe
Clean dead code
2016-04-09 19:06:40 +02:00
Laurent Destailleur
f8b39ab50e
Fix errors reported by scrutinizer
2016-04-09 19:04:23 +02:00
Laurent Destailleur
1b6fa8ec34
Clean dead code
2016-04-09 19:04:04 +02:00
Laurent Destailleur
b16d9a88d5
Fix regression after renaming vars
2016-04-09 19:03:34 +02:00
Laurent Destailleur
27217ccccd
Maxi debug of supplier order workflow.
...
Add trigger ORDER_SUPPLIER_CLASSIFY_BILLED
Parameter user is added so it is defined into triggers.
2016-04-09 18:51:09 +02:00
Laurent Destailleur
c2fc9ecf68
Fix scrutinizer warning
2016-04-09 16:12:53 +02:00
Laurent Destailleur
507b9a2956
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-04-09 16:00:52 +02:00
Laurent Destailleur
935327d911
Fix scrutinizer warning
2016-04-09 16:00:24 +02:00
Frédéric FRANCE
f90cffd74a
Update nusoap.php
...
re-establish user-agent
2016-04-09 15:42:53 +02:00
Laurent Destailleur
83644dcb93
Fix errors reported by scrutinizer
2016-04-09 15:38:15 +02:00
Laurent Destailleur
f2f672a801
FIX variable outpulang not defined
2016-04-09 15:14:27 +02:00
Laurent Destailleur
475c11ca8f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-09 15:08:29 +02:00
Laurent Destailleur
724610ba5b
Quality fixes reported by scrutinizer
2016-04-09 15:07:55 +02:00
Scrutinizer Auto-Fixer
c2243909e9
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-04-09 13:07:33 +00:00
Laurent Destailleur
5b55af4d66
NEW Mutualize code: Use one call of function "addThumbs", when possible,
...
to generate thumbs files instead of several call of "vignette" function.
2016-04-09 14:12:21 +02:00
Laurent Destailleur
e869ed51e4
Use the update method to edit cost price of a product instead of
...
setValue that does not run triggers.
2016-04-09 10:41:39 +02:00
Laurent Destailleur
cd13c942ed
FIX When editing a numeric that is not defined, we must not show 0 but
...
an empty field.
2016-04-09 10:40:56 +02:00
Laurent Destailleur
874c65dfda
Fix unique key of table
2016-04-09 10:13:56 +02:00
Laurent Destailleur
7b16482cee
Add comment to show directoves to solve conception error on lot
...
management (add a table to store all lots and their properties: date,
note, ...)
Removed deprecated field pmp at stock level (pmp is at product level)
2016-04-09 10:01:22 +02:00
Laurent Destailleur
3827a06796
Debug the supplier ref reputation feature.
2016-04-08 22:18:36 +02:00
Laurent Destailleur
448758bbf4
Merge branch 'develop_NEW_supplier_price_reputation' of
...
https://github.com/atm-alexis/dolibarr into
atm-alexis-develop_NEW_supplier_price_reputation
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-04-08 22:01:55 +02:00
Laurent Destailleur
22bfa7a9e2
Add logs
2016-04-08 21:50:48 +02:00
Laurent Destailleur
184705fb14
Debug web service project
2016-04-08 21:50:31 +02:00
Laurent Destailleur
60682f075c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-08 21:46:17 +02:00
Laurent Destailleur
23c3186932
Merge pull request #4967 from IonAgorria/ws-project
...
New: Project WebServices
2016-04-08 21:45:56 +02:00
Laurent Destailleur
f205b04b39
Merge pull request #4960 from defrance/patch-119
...
change comment
2016-04-08 21:32:55 +02:00
Laurent Destailleur
234f3e331d
Merge pull request #4962 from FHenry/3.8
...
FIX : Template email must take care of position column
2016-04-08 21:32:27 +02:00
Laurent Destailleur
2ffe06b1b3
Merge pull request #4965 from GPCsolutions/3.9-sentry
...
Prevent sentry logging error with 3.9 update
2016-04-08 21:31:32 +02:00
Laurent Destailleur
010a4f8929
Merge pull request #4945 from frederic34/shipcust
...
NEW : Select Preferred Sending Method for a third party
2016-04-08 21:31:06 +02:00
Laurent Destailleur
01e538fa78
Merge pull request #4942 from aspangaro/4.0-p16
...
NEW: Move HRM area page in HRM directory
2016-04-08 20:51:17 +02:00
Laurent Destailleur
92f1092f5c
Fix remove warnings
2016-04-08 19:46:56 +02:00
Laurent Destailleur
daa1aed363
Bad placeholder
2016-04-08 19:31:18 +02:00
Laurent Destailleur
80caf58866
FIX Default vat is not set correctly when an error occured and we use
...
VAT identified by a code.
2016-04-08 19:19:13 +02:00
Laurent Destailleur
cfcbc34972
FIX Default vat is not set correctly when an error occured and we use
...
VAT identified by a code.
2016-04-08 19:16:40 +02:00
Laurent Destailleur
b9ffc18c27
Uniformize log of supplier order. Now use the generic log feature.
2016-04-08 17:28:48 +02:00
Laurent Destailleur
f14b03a230
NEW Add more trackable events (create, submit and receive supplier
...
order). So we will be able to use generic features to log what was done
with the specific table llx_commande_fournisseur_log
2016-04-08 17:07:25 +02:00
Laurent Destailleur
5753f21745
Missing translations
2016-04-08 16:09:35 +02:00
Laurent Destailleur
eb7bba9568
Fix translation
2016-04-08 16:07:30 +02:00
Laurent Destailleur
04a85ff831
FIX Substitution key on email of supplier order was broken
2016-04-08 16:06:50 +02:00
Laurent Destailleur
66ec4cdcf6
Update pdfmake.js
2016-04-08 15:53:13 +02:00
Laurent Destailleur
a74fc347bb
Fix translation
2016-04-08 15:41:01 +02:00
Laurent Destailleur
443c5a490a
Update ckeditor to 4.5.8
2016-04-08 15:36:24 +02:00
Laurent Destailleur
9d836571d5
Update PHPExcel
2016-04-08 15:32:13 +02:00
Laurent Destailleur
2f42a226d0
Update escpos-php
2016-04-08 15:30:43 +02:00
Laurent Destailleur
1b04eabf1f
Merge log with events tabs
2016-04-08 14:28:49 +02:00
Laurent Destailleur
cefc373a5f
Missing translations
2016-04-08 11:42:02 +02:00
Laurent Destailleur
104e34fe22
Fix css and missing link "go to list"
2016-04-08 03:40:23 +02:00
Laurent Destailleur
7a48ceb635
Uniformize code for mass actions
2016-04-08 02:53:10 +02:00
Laurent Destailleur
8222624ff0
NEW Can select fields to show on list also for list of customer orders,
...
shipments and invoices.
2016-04-08 02:39:57 +02:00
Laurent Destailleur
24c91933d0
Work on select fields for orders, invoices and shipments
2016-04-08 01:00:02 +02:00
Ion Agorria
a5c5f9b10e
New: Project WebServices
2016-04-07 22:08:50 +02:00
Laurent Destailleur
b1c2198154
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/ajax/selectsearchbox.php
htdocs/core/lib/price.lib.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/modCommande.class.php
htdocs/core/modules/modFacture.class.php
htdocs/projet/list.php
htdocs/societe/list.php
2016-04-07 20:01:52 +02:00
Laurent Destailleur
d7f669b918
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-07 19:28:18 +02:00
Laurent Destailleur
39b61d6924
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/boxes/box_task.php
htdocs/core/lib/files.lib.php
2016-04-07 19:27:53 +02:00
Laurent Destailleur
4092f5fa2f
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2016-04-07 19:24:49 +02:00
Laurent Destailleur
f7fb95cab8
FIX Box disabled because bugged
2016-04-07 19:24:29 +02:00
Raphaël Doursenaud
9d6efde935
Prevent sentry logging error with 3.9 update
...
Since we don't ship the required libraries anymore,
if the module had been enabled before upgrade,
the code was failing making Dolibarr totally unusable.
Mitigated the issue by disabling sentry logging
if the required libraries are unavailable.
2016-04-07 17:16:42 +02:00
Christophe Battarel
d052eac6fc
NEW: add product type filter on turnover report
2016-04-07 14:57:41 +02:00
Laurent Destailleur
086345490d
Generalize the set of trackid for everyemail sent by dolibarr.
2016-04-07 14:29:07 +02:00
Laurent Destailleur
1e6152eb53
FIX Missing a row when incoterm is on
2016-04-07 14:17:20 +02:00
Florian HENRY
f62a45ddfc
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2016-04-07 14:16:38 +02:00
Florian HENRY
1f723cb8d0
FIX : Template email must take care of positino column
2016-04-07 14:16:10 +02:00
Laurent Destailleur
7f129d14d7
Better responsive design
2016-04-07 14:08:38 +02:00
Laurent Destailleur
059466030a
FIX Missing a new line into log of sent emails
2016-04-07 12:42:18 +02:00
Laurent Destailleur
2c829e7cb6
NEW Add picto on module list to show warning and if module is an
...
external module.
2016-04-07 11:50:45 +02:00
Laurent Destailleur
ee53a8b1a8
NEW Can filter modules on publisher
2016-04-06 16:45:22 +02:00
Laurent Destailleur
1a1dc39a6b
Mark a duplicate function as deprecated
2016-04-06 14:53:14 +02:00
Laurent Destailleur
4e3985fbc5
NEW If option to see non stable modules is on, add a filter into module
...
list to filter on level (deprecated, experimental, development)
2016-04-06 13:27:46 +02:00
BENKE Charlie
9484dc5b3e
change comment
2016-04-06 11:38:34 +02:00
Laurent Destailleur
a43a0a3f4c
Debug module loan and disable non working features
2016-04-06 11:21:55 +02:00
nka11
0978ebc731
Improve categories API to retreive categories of a given Item
2016-04-06 10:25:40 +02:00
Alexis Algoud
a2c5bfa72c
FIX parse error
2016-04-06 10:20:38 +02:00
nka11
f3ae67a434
added customer API
2016-04-06 10:19:25 +02:00
Alexis Algoud
11bb4d1cfb
Show in select
2016-04-06 10:17:13 +02:00
Alexis Algoud
c2a5ad7d9c
FIX sql
2016-04-06 10:05:03 +02:00
Alexis Algoud
61a077b0ee
NEW reputation for price supplier
2016-04-06 09:58:03 +02:00
Juanjo Menent
b59b758016
Merge pull request #4943 from atm-gauthier/NEW_multientity_for_project
...
NEW : project sharing in select_projetcs_list function
2016-04-05 17:48:23 +02:00
Juanjo Menent
8bdda85801
Merge pull request #4955 from fmarcet/3.9
...
FIX: Not removing code into vatrate.
2016-04-05 17:43:48 +02:00
Laurent Destailleur
f9d7c27bd2
FIX Export must use a left join to not loose lines
2016-04-05 17:17:40 +02:00
Laurent Destailleur
dd87195a07
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-04-05 17:11:54 +02:00
Laurent Destailleur
ed0ab05b93
FIX Damn, where was the project ref ?
2016-04-05 17:11:44 +02:00
fmarcet
d3794bb145
FIX: Not removing code into vatrate.
2016-04-05 16:49:50 +02:00
Juanjo Menent
10df0e33d4
Merge pull request #4896 from grandoc/3.9
...
fix a lot of beug
2016-04-05 16:49:22 +02:00
Laurent Destailleur
e7adae13ca
Code comment
2016-04-05 12:59:17 +02:00
Laurent Destailleur
3738dae38d
NEW Add date_rum into table of thirdparty bank account.
2016-04-05 12:06:47 +02:00
Laurent Destailleur
0f0850664d
FIX Remove duplicates of shipment modes
2016-04-05 11:47:52 +02:00
Laurent Destailleur
a0a31a3c94
Better responsive design for dictionnaries
2016-04-05 11:24:58 +02:00
Laurent Destailleur
2d102d3132
Bad translation key
2016-04-05 10:24:28 +02:00
Laurent Destailleur
a656e42d42
Missing translation
2016-04-05 10:16:07 +02:00
Laurent Destailleur
6c87dfafae
FIX Bad translation key
2016-04-05 10:12:03 +02:00
frederic34
e53501f89d
add lang
2016-04-04 18:37:04 +02:00
frederic34
198b9ce8fe
Select Preferred Sending Method for a customer
2016-04-04 18:28:55 +02:00
Florian HENRY
b7a0ab784b
travis
2016-04-04 16:59:17 +02:00
Florian HENRY
c0c37c4992
travis
2016-04-04 16:36:39 +02:00
Laurent Destailleur
43165bab02
FIX Filter/search on extrafields on lists
...
Conflicts:
dev/skeletons/skeleton_list.php
htdocs/projet/list.php
htdocs/societe/list.php
2016-04-04 16:22:26 +02:00
Laurent Destailleur
76ad7f36b9
FIX Filter/search on extrafields on lists
2016-04-04 16:03:35 +02:00
Laurent Destailleur
592a041bc5
FIX Filter/search on extrafields on lists
2016-04-04 16:02:29 +02:00
Florian HENRY
86c34a313e
travis
2016-04-04 15:28:25 +02:00
Laurent Destailleur
5101c96223
Restore button to create object from the project view.
2016-04-04 15:25:08 +02:00
Florian HENRY
344a87f970
Merge branch 'develop' into develop_advtargetemailiing
...
Conflicts:
htdocs/admin/dict.php
htdocs/core/class/html.formaccounting.class.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/install/mysql/tables/llx_c_accounting_category.sql
2016-04-04 14:43:17 +02:00
Laurent Destailleur
1d700cd286
Keep empty if field value has no value.
2016-04-04 13:26:48 +02:00
Laurent Destailleur
122cd200ec
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-04 13:24:36 +02:00
gauthier
e043aebfa1
NEW : project sharing in select_projetcs_list function
2016-04-04 11:05:12 +02:00
Laurent Destailleur
71ef9bc90f
Merge pull request #4940 from IonAgorria/fix-facrec
...
Fix #4227 : Change FactureRec superclass to CommonInvoice
2016-04-04 09:24:55 +02:00
aspangaro
a85575a93c
Merge remote-tracking branch 'Upstream/develop' into 4.0-p16
2016-04-04 05:31:12 +02:00
aspangaro
c6aabd3f34
NEW: Move HRM area page in HRM directory
2016-04-04 05:29:12 +02:00
Laurent Destailleur
21475b587d
Merge pull request #4939 from marcosgdf/patch-2
...
Corrected PHP documentation of calcul_price_total function
2016-04-04 00:43:14 +02:00
Laurent Destailleur
30f27b6fac
Merge pull request #4933 from frederic34/patch-10
...
FIX correctly retreive ref_customer
2016-04-04 00:36:49 +02:00
Laurent Destailleur
f3c032ba21
Merge pull request #4925 from frederic34/patch-9
...
Update llx_propal_merge_pdf_product.sql
2016-04-04 00:34:40 +02:00
Laurent Destailleur
bd4bdcea37
Merge pull request #4924 from frederic34/patch-8
...
FIX Remove sql error when creating table llx_usergroup_extrafields.sql
2016-04-04 00:33:23 +02:00
Laurent Destailleur
29fc94e416
Merge pull request #4923 from frederic34/patch-7
...
FIX Remove sql error when creating table llx_establishment.sql
2016-04-04 00:31:20 +02:00
Laurent Destailleur
f8fa2202ed
Merge pull request #4921 from FHenry/3.9
...
Add hook parameters on New search Box
2016-04-04 00:25:56 +02:00
Laurent Destailleur
f36f33f71b
Merge pull request #4915 from defrance/patch-117
...
Add contact hook on specific task contact page
2016-04-04 00:21:57 +02:00
Laurent Destailleur
6a4ca98ad9
Merge pull request #4908 from altatof/fix_bad_rounding
...
FIX: systematic rounding causes prices to be updated without reason
2016-04-04 00:18:18 +02:00
Laurent Destailleur
cab1c0f5cd
Merge pull request #4886 from apachler/develop
...
Added functionality to get project customer contact as contact_xx tags
2016-04-04 00:11:19 +02:00
Marcos García
fded7d3e9a
Corrected PHP documentation of calcul_price_total function
2016-04-03 22:17:25 +02:00
Laurent Destailleur
89bc29ed45
Try to remove grey background when using jquery jmobile.
2016-04-03 21:08:03 +02:00
Ion Agorria
fbe0414a1f
Change FactureRec superclass CommonInvoice
2016-04-03 21:02:19 +02:00
Laurent Destailleur
4ced5ed27f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-03 20:02:28 +02:00
Laurent Destailleur
cea48a8dd6
FIX bad translation language loaded
...
FIX When changing thirdparty on event card, the showempty option of
contact was lost.
FIX Bad placeholder shown on combo to select a thirdparty.
2016-04-03 20:02:02 +02:00
Juanjo Menent
2388887e99
Merge pull request #4938 from aspangaro/4.0-p15
...
FIX: Accountancy - Update balance to add description of the accounting account + bugfix
2016-04-03 17:38:02 +02:00
aspangaro
e79c6c1439
Correct travis error
2016-04-03 17:09:22 +02:00
Juanjo Menent
b3a5c8bae2
Merge pull request #4937 from simnandez/dolibarr-3510
...
Close #3510 Add a numbering module for check deposits
2016-04-03 16:22:34 +02:00
Juanjo Menent
8f2fb64efb
Merge pull request #4929 from aspangaro/4.0-p12
...
FIX: Problem with dolibarr installation/migration script. Range is a reserved name...
2016-04-03 16:20:31 +02:00
Juanjo Menent
deeb6f604d
Merge pull request #4905 from altatof/fix_margin_display
...
FIX: dont retrieve new buying price on margin display
2016-04-03 16:17:41 +02:00
Juanjo Menent
ba1c029723
Merge pull request #4904 from aspangaro/4.0-p10
...
FIX: Accountancy Add informations to show in journal & correct problems to export in bookkee…
2016-04-03 16:16:30 +02:00
Juanjo Menent
75eb718c01
Merge pull request #4922 from atm-alexis/NEW_multientity_for_project
...
FIX multicompany project access
2016-04-03 16:13:24 +02:00
Juanjo Menent
314069f1da
Qual: Remove unused function
2016-04-03 15:47:07 +02:00
aspangaro
f8bc456807
FIX: Accountancy - Update balance to add description of the accounting account + bugfix
2016-04-03 15:32:46 +02:00
Laurent Destailleur
0e6ee0d744
Merge remote-tracking branch 'origin/3.9' into develop
2016-04-03 12:47:02 +02:00
Laurent Destailleur
3aeb579486
Fix bad link
2016-04-03 12:46:34 +02:00
Juanjo Menent
cd6c6f64c5
Merge remote-tracking branch 'upstream/develop' into dolibarr-3510
...
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-04-03 12:41:14 +02:00
Juanjo Menent
305bbf1450
Fix Doc
2016-04-03 12:39:39 +02:00
Juanjo Menent
8cd1b95842
Merge pull request #4935 from aspangaro/4.0-p13
...
FIX: Accountancy - Correct the display of account_parent in chart of accounts
2016-04-03 12:36:03 +02:00
Juanjo Menent
e8b2d6baab
NEW #3510 : Working
2016-04-03 12:22:18 +02:00
Juanjo Menent
9d189b3c04
NEW #3510 : Working
2016-04-03 12:14:51 +02:00
Juanjo Menent
d55d12baeb
NEW #3510 : Working
2016-04-03 11:56:31 +02:00
Florian HENRY
0ab40f11be
Merge branch 'develop' into develop_advtargetemailiing
2016-04-03 11:29:17 +02:00
aspangaro
c48869e02b
Bugfix
2016-04-03 10:51:56 +02:00
aspangaro
9cc7b53071
Merge remote-tracking branch 'Upstream/develop' into 4.0-p13
2016-04-03 10:50:33 +02:00
aspangaro
33e8833287
Fix travis
2016-04-03 10:47:21 +02:00
Laurent Destailleur
6096c8c49a
Minor fix in CSS
2016-04-02 16:53:55 +02:00
Laurent Destailleur
e954fc07b3
Use natural_search for sql search forging
2016-04-02 16:30:17 +02:00
Laurent Destailleur
127ceeac8c
Uniformize code for list of audit events
2016-04-02 16:12:48 +02:00
Laurent Destailleur
10f639507f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
2016-04-02 15:54:51 +02:00
Laurent Destailleur
066c793de2
FIX image extension must be in lower case
...
Conflicts:
htdocs/core/lib/files.lib.php
2016-04-02 15:46:01 +02:00
Laurent Destailleur
c12541f4f2
FIX image extension must be in lower case
2016-04-02 15:00:58 +02:00
Laurent Destailleur
c0b2d7405a
FIX Generated thumbs must always use the png format so using thumbs can
...
work.
2016-04-02 14:46:04 +02:00
Laurent Destailleur
599b225489
FIX Creation of thumb image for size "small" was not done.
...
Conflicts:
htdocs/core/lib/files.lib.php
2016-04-02 14:21:50 +02:00
Laurent Destailleur
be8384389f
FIX Creation of thumb image for size "small" was not done.
...
Conflicts:
htdocs/core/lib/files.lib.php
2016-04-02 14:20:21 +02:00
Laurent Destailleur
e1bec46a34
FIX The include file for action on files should not be a template file
...
but an action include file.
2016-04-02 14:16:16 +02:00
Laurent Destailleur
66f9f0d046
FIX Creation of thumb image for size "small" was not done.
2016-04-02 14:15:38 +02:00
aspangaro
0c5f504881
FIX: Accountancy - Correct the display of account_parent
2016-04-02 06:22:31 +02:00
Laurent Destailleur
281b06a2d3
NEW Introduce option MAIN_WEIGHT_DEFAULT_UNIT and
...
MAIN_VOLUME_DEFAULT_UNIT to force output unit for weight and volume.
2016-04-01 18:44:23 +02:00
Frédéric FRANCE
d4529d19c7
Update facture.php
...
ref_client in order
ref_customer in shipping
2016-04-01 17:32:58 +02:00
Florian HENRY
038b928ea4
fix travis
2016-04-01 17:09:03 +02:00
Laurent Destailleur
7edd1d89a0
Fix missing td
2016-04-01 16:59:17 +02:00
Laurent Destailleur
d14f3d7e2b
FIX When deleting last shipment, status "shipment in progress" of order
...
must move back to status "validated".
2016-04-01 16:59:08 +02:00
Laurent Destailleur
e40b678d7b
Uniformize code
2016-04-01 16:29:47 +02:00
Laurent Destailleur
97b5026ad8
Uniformize code and css
2016-04-01 16:18:45 +02:00
Florian HENRY
ae51321040
Debug Advance target emailing
2016-04-01 14:30:02 +02:00
Florian HENRY
867dbc766e
Merge branch 'develop' into develop_advtargetemailiing
2016-04-01 14:03:43 +02:00
Florian HENRY
081c7824d2
FIX : range is MySQL reserved word, cannot be used as column names
2016-04-01 14:00:14 +02:00
Laurent Destailleur
9c394b58b5
Move help text at better place.
2016-04-01 12:40:34 +02:00
Laurent Destailleur
be483bd787
FIX Some records were lost into margin per product report
2016-04-01 12:28:15 +02:00
Laurent Destailleur
8a1358d539
FIX Some records were lost into margin per product report
2016-04-01 12:27:49 +02:00
Laurent Destailleur
27ed9ba3da
Remove now link useless here
2016-04-01 12:13:43 +02:00
Laurent Destailleur
feb35adbe1
FIX Missing clean of criteria
2016-04-01 12:04:07 +02:00
Laurent Destailleur
063905ea03
Save space again (another line won)
2016-04-01 11:43:11 +02:00
Laurent Destailleur
9eb1925825
FIX No need to ask doc template when only one is defined
2016-04-01 11:12:49 +02:00
Laurent Destailleur
c340745b78
FIX Option "showstock" was not effective into warehouse list
2016-04-01 11:05:15 +02:00
Laurent Destailleur
0981039573
FIX If stock module not enabled, it was not possible to make shipments
2016-04-01 10:57:18 +02:00
Florian HENRY
304aab957b
Start implement advance arget emalaing
2016-04-01 10:52:19 +02:00
aspangaro
1df1e775ee
Space2
2016-04-01 06:49:24 +02:00
aspangaro
e118aad95f
Space
2016-04-01 06:48:17 +02:00
aspangaro
620e03337a
Merging problem
2016-04-01 06:45:46 +02:00
aspangaro
84d326e036
FIX: Problem with dolibarr installation/migration script. Range is a reserved name.
2016-04-01 06:41:49 +02:00
Laurent Destailleur
2a19326a3f
FIX Missing database escaping on supplier price insert/update
2016-03-31 21:47:32 +02:00
Frédéric FRANCE
90e74b346e
Update llx_propal_merge_pdf_product.sql
...
No need IF NOT EXISTS at install time
2016-03-31 17:13:38 +02:00
Frédéric FRANCE
125256c825
Update llx_usergroup_extrafields.sql
...
No need IF NOT EXISTS at install time
2016-03-31 17:11:17 +02:00
Frédéric FRANCE
1419b0e385
Update llx_establishment.sql
2016-03-31 17:06:10 +02:00
Laurent Destailleur
fea9c65906
FIX Missing clean of criteria
2016-03-31 15:22:43 +02:00
root
b018500fd4
FIX multicompany project access
2016-03-31 14:44:18 +02:00
Florian HENRY
f567a2a0ce
Search box hook
2016-03-31 12:50:40 +02:00
Laurent Destailleur
9459a36c12
Minor look enhancement
2016-03-31 12:28:45 +02:00
Florian HENRY
5d4c959d2e
Add hook parameters on New search Box
2016-03-31 12:18:26 +02:00
Laurent Destailleur
54f3005666
NEW Can select fields to show on proposal lists.
2016-03-31 11:58:05 +02:00
Laurent Destailleur
27cf494009
Fix bad translation
2016-03-30 23:35:43 +02:00
BENKE Charlie
98ef179307
Add contact hook
...
I use the same hook name as contactpl
2016-03-30 21:09:27 +02:00
Laurent Destailleur
2d9c53fc26
NEW Merge all boxes "related objects" into one. This save a lot of room
...
on most card and avoid often horizontal scoll.
2016-03-30 19:18:31 +02:00
Laurent Destailleur
a47accb1c3
FIX PMP is deprecated at warehouse level
2016-03-30 18:08:08 +02:00
Laurent Destailleur
a36abd43fd
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-30 16:27:14 +02:00
Laurent Destailleur
7146a8319b
FIX Each time we edit a line, we loose the unit price.
2016-03-30 16:26:34 +02:00
Laurent Destailleur
b367c9daac
Enhance picto for setup
2016-03-30 16:07:48 +02:00
Laurent Destailleur
0c3635cf8f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-03-30 15:25:27 +02:00
Laurent Destailleur
e908b983d4
NEW Can search on shipments into the quick search box
2016-03-30 15:25:16 +02:00
Laurent Destailleur
fa10f9e030
FIX #4880
2016-03-30 14:07:07 +02:00
Laurent Destailleur
07e622a7f8
Introduce () to have code cleaner
2016-03-30 14:04:22 +02:00
Laurent Destailleur
a15a46449c
Merge pull request #4910 from aspangaro/4.0-p11
...
NEW: Accountancy - Drop old table not used (Informations are already presents in llx_accounting_bookkeeping)
2016-03-30 14:00:50 +02:00
Laurent Destailleur
c730312a9f
Merge pull request #4903 from aspangaro/4.0-p9
...
NEW: Accountancy - Add category
2016-03-30 13:58:37 +02:00
Marcos García de La Fuente
362bc106eb
FIX Multiprice generator didn't recalculate prices if only the price_base_type property changes
2016-03-30 11:40:57 +02:00
Laurent Destailleur
334cdbc2f5
NEW Option MAIN_LIST_FILTER_ON_DAY is supported on proposal list
2016-03-30 11:13:29 +02:00
Laurent Destailleur
e79633fa8d
Fix search on supplier orders
2016-03-30 11:03:39 +02:00
Laurent Destailleur
abcbc5c0da
Fix limit management
2016-03-30 10:45:14 +02:00
Andreas Pachler
7eded39e28
Reworked functionality to get project contact as contact_xx tags
2016-03-30 08:34:32 +02:00
aspangaro
9cac252641
NEW: Accountancy - Drop old table not used (Informations are already presents in llx_accounting_bookkeeping)
2016-03-30 06:54:28 +02:00
aspangaro
ef03dc3454
Youps !
2016-03-30 06:49:10 +02:00
aspangaro
26e017f4ef
Merge remote-tracking branch 'Upstream/develop' into 4.0-p9
...
Conflicts:
htdocs/accountancy/admin/card.php
2016-03-30 06:05:38 +02:00
aspangaro
f6f7dc8e86
Try to correct travis II
2016-03-30 05:41:44 +02:00
Laurent Destailleur
0d9a86db3f
Minor lool enhancement
2016-03-30 00:06:55 +02:00
Laurent Destailleur
ff96ebf381
Enahnce navigation
2016-03-29 22:09:13 +02:00
aspangaro
29c4971d5a
Try to correct travis
2016-03-29 21:14:19 +02:00
Laurent Destailleur
32080e99dd
Fix dolistore url
2016-03-29 21:14:12 +02:00
Laurent Destailleur
b51bd74934
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-03-29 21:09:26 +02:00
Laurent Destailleur
83dd3081d5
FIX #4880 . Lang should not be requied to fetch a user
2016-03-29 21:07:53 +02:00
aspangaro
e43043edcb
Merge remote-tracking branch 'Upstream/develop' into 4.0-p10
2016-03-29 21:02:46 +02:00
Laurent Destailleur
61c0ee3c6c
Merge pull request #4900 from aspangaro/4.0-p8
...
NEW: Accountancy Use clean_account to remove 0 at the right when we create an account in chart of accounts
2016-03-29 20:32:34 +02:00
Laurent Destailleur
12c8ed6cf0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-03-29 20:21:19 +02:00
Laurent Destailleur
2e5cc98e59
Fix into badges visibility
2016-03-29 20:06:01 +02:00
aspangaro
c9271e04a0
Merge remote-tracking branch 'Upstream/develop' into 4.0-p9
...
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-03-29 19:54:41 +02:00
Laurent Destailleur
2e5b61dac7
Merge pull request #4909 from dzroot/patch-1
...
Update llx_20_c_departements.sql
2016-03-29 19:44:40 +02:00
Laurent Destailleur
3142fd3d84
Merge pull request #4899 from aspangaro/4.0-p7
...
Correct problem of merging with my last commits
2016-03-29 19:41:50 +02:00
Laurent Destailleur
718e9a7226
Filter on module origin
2016-03-29 19:18:53 +02:00
Laurent Destailleur
f4bea56a91
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-03-29 19:18:31 +02:00
Laurent Destailleur
39c18c37b3
Merge pull request #4898 from defrance/patch-115
...
Add photo on contact
2016-03-29 19:18:02 +02:00
Laurent Destailleur
4d37c47990
NEW Can select language from combo list on page to overwrite a
...
translation
2016-03-29 18:05:03 +02:00
AbdelHakim ALLAL
ed0fd32d15
Update llx_20_c_departements.sql
...
Correcting ALGERIA Provinces numbers
*Missing AL10
*Correcting the rest
2016-03-29 15:23:48 +01:00
Laurent Destailleur
98c2ba8c61
Normalize code
2016-03-29 15:41:46 +02:00
Laurent Destailleur
6b4909f802
Lost sort params
2016-03-29 15:31:52 +02:00
Laurent Destailleur
6188c3fced
NEW Introduce a predefined job to run database backup
2016-03-29 14:52:27 +02:00
Laurent Destailleur
fce54e9c48
Fix tooltip too large
2016-03-29 12:49:41 +02:00
Christophe Battarel
024f55d461
FIX: systematic rounding causes prices to be updated without reason
2016-03-29 12:02:36 +02:00
Christophe Battarel
b8f3264f60
FIX: dont retrieve new buying price on margin display
2016-03-29 11:37:35 +02:00
aspangaro
1f31163e5e
Correct travis
2016-03-28 21:36:57 +02:00
aspangaro
a1d95e11ed
Correct table
2016-03-28 21:33:49 +02:00
aspangaro
a67b9afb6c
FIX: Add informations to show & correct problems to export in bookkeeping
2016-03-28 21:31:23 +02:00
aspangaro
2be979569d
Debug II
2016-03-28 21:03:47 +02:00
aspangaro
cbecb37c59
debug
2016-03-28 15:32:57 +02:00
aspangaro
436fb91901
Uniformize name of table
2016-03-28 14:50:51 +02:00
aspangaro
8acf39cbb1
Uniformize name of table
2016-03-28 13:58:14 +02:00
aspangaro
432cc44ab6
NEW: Accountancy - Add category
2016-03-28 13:51:19 +02:00
aspangaro
98a46fd335
NEW: Accountancy Use clean_account to remove 0 at the right when we create an account in chart of accounts
2016-03-28 08:21:02 +02:00
aspangaro
85d51b0d6f
Correct of problem of merging with my last commits
2016-03-28 07:46:55 +02:00
philippe grand
85cd818da1
Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9
2016-03-27 10:50:37 +02:00
BENKE Charlie
34fb67fe99
Add contact photo
2016-03-26 18:12:03 +01:00
BENKE Charlie
962f0e33f7
Add : photo on contact
2016-03-26 18:05:09 +01:00
philippe grand
b3285996dc
fix travis issue from commit 139dc9a7
2016-03-26 12:39:08 +01:00
Laurent Destailleur
4145874d34
Better tranlsation message
2016-03-26 12:29:13 +01:00
Laurent Destailleur
aab7575528
FIX Problem when disabling module product or service. They both include
...
same boxes, we must not disable box if the other is still active
2016-03-26 12:28:31 +01:00
Laurent Destailleur
40e0347bb5
More complete dependencies
2016-03-26 12:27:34 +01:00
Laurent Destailleur
1d02f6446f
FIX: Box must not visible of module it depends on are not enabled
2016-03-26 11:52:59 +01:00
Laurent Destailleur
22bed60a07
Remove manually other PR that should not be validated (travis errors
...
reported on PR with serious mysql error in migration due to use of
reserved keyword "range" as a name of a field).
2016-03-26 11:19:45 +01:00
Laurent Destailleur
aee5f6dd2a
Merge pull request #4894 from defrance/patch-114
...
FIX : Qual and some little fix
2016-03-26 10:27:50 +01:00
Juanjo Menent
dc491fbae9
Merge pull request #4887 from defrance/patch-111
...
NEW : INVOICE_CAN_NEVER_BE_CANCELED global
2016-03-26 09:51:36 +01:00
Laurent Destailleur
0715353960
FIX A not enabled field for list must not into fields to add
2016-03-25 19:44:18 +01:00
Laurent Destailleur
d213002892
FIX A not enabled field for list must not into fields to add
2016-03-25 19:42:42 +01:00
Laurent Destailleur
08e506874a
FIX If thirdparty module not enabled, we must hide thirdparty info.
2016-03-25 19:42:14 +01:00
Laurent Destailleur
b42dbe5b37
Fix restore old css. New ergonomy best practice rules tends to ask
...
reduce the more we can lines and orders around menu and area. I will
restore the separator when adapting the style to match look of md theme
later...
2016-03-25 18:45:43 +01:00
Laurent Destailleur
7def29301a
Merge pull request #4893 from defrance/patch-113
...
FIX : add line of separation between left menu
2016-03-25 18:21:52 +01:00
Laurent Destailleur
66eaffd9fa
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-03-25 18:19:59 +01:00
BENKE Charlie
51b82eba43
if we not allowed to edit we don't edit
2016-03-25 18:19:51 +01:00
philippe grand
08970e67d7
fix a lot of beug
2016-03-25 18:16:58 +01:00
BENKE Charlie
767ce063df
Change done
2016-03-25 18:16:05 +01:00
Laurent Destailleur
facdddbb23
Merge pull request #4888 from defrance/patch-112
...
Add : new translations
2016-03-25 18:13:45 +01:00
Laurent Destailleur
6a58b025f8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-03-25 18:10:50 +01:00
Laurent Destailleur
bc1b2d048b
Uniformise option name
2016-03-25 18:09:42 +01:00
Laurent Destailleur
6aba69c69c
Merge pull request #4885 from aspangaro/4.0-p6
...
NEW: Move HRM dictionary from module to core dictionaries
2016-03-25 18:06:57 +01:00
Laurent Destailleur
423120db17
Merge pull request #4876 from atm-alexis/NEW_multientity_for_project
...
# New # multientity for project
2016-03-25 18:01:45 +01:00
Laurent Destailleur
46fe16be0b
Merge pull request #4871 from sbechet/develop
...
Postgresql compatibility patch + cosmetic
2016-03-25 17:57:29 +01:00
Laurent Destailleur
00bf8caa8c
FIX #4870
2016-03-25 17:55:58 +01:00
Laurent Destailleur
f61f1c7a27
Merge pull request #4857 from marcosgdf/bankacc-misc
...
Little refactor
2016-03-25 17:43:56 +01:00
Laurent Destailleur
30aea901b8
Merge pull request #4855 from marcosgdf/account-oop
...
NEW Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country
2016-03-25 17:41:39 +01:00
BENKE Charlie
6443170c4d
FIX : Qual and some little fix
2016-03-25 17:19:45 +01:00
Laurent Destailleur
34c197f268
Restore compatibility
2016-03-25 17:15:08 +01:00
Laurent Destailleur
c8fd12cdaa
Update code comment
2016-03-25 17:14:20 +01:00
Laurent Destailleur
b29b5fa71d
Merge pull request #4824 from FHenry/dev_jquery
...
Last version of JQuery 1.12 and DataTables Componenent with working
2016-03-25 16:50:26 +01:00
BENKE Charlie
bf2d52894a
correct travis too
2016-03-25 16:48:45 +01:00
Laurent Destailleur
a0563b410e
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-25 16:24:26 +01:00
Laurent Destailleur
884ba3a0ba
Fix bad hook function name
2016-03-25 16:23:09 +01:00
Laurent Destailleur
a2d6cf8549
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-25 16:17:17 +01:00
Laurent Destailleur
9ddae7d7f3
Fix bad hook function name
2016-03-25 16:17:01 +01:00
Laurent Destailleur
7ca1e27103
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-25 16:15:54 +01:00
Laurent Destailleur
f251ca579b
Fix bad hook function name
2016-03-25 16:15:35 +01:00
Laurent Destailleur
ea9db792be
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-25 16:14:37 +01:00
Laurent Destailleur
7430d09739
Fix bad hook function name
2016-03-25 16:13:22 +01:00
Laurent Destailleur
85cd0038f5
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-25 16:10:10 +01:00
Laurent Destailleur
5e55f0ecce
Fix bad function name into hook
2016-03-25 16:07:42 +01:00
Laurent Destailleur
61bc8fc9ef
NEW Can edit value date of a vat payment after recording it.
...
Conflicts:
htdocs/compta/localtax/card.php
htdocs/core/class/html.form.class.php
2016-03-25 16:01:45 +01:00
Juanjo Menent
aa9a39cab5
NEW #3510 : Standardize module
2016-03-25 15:59:44 +01:00
aspangaro
05df3408f2
Debug works
2016-03-25 15:59:38 +01:00
aspangaro
1d780e7e77
NEW: Accountancy - Add category to manage the display of the income
...
statement and the balance sheet
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-03-25 15:59:31 +01:00
aspangaro
f8f55e05d0
NEW: Accountancy Add a way to initialize chart of accounts
2016-03-25 15:57:54 +01:00
aspangaro
3dc991974c
FIX: Accountancy Bank journal Fix some problem with other module
2016-03-25 15:57:46 +01:00
Laurent Destailleur
a68b704daf
FIX Must not return error when vars does not exists
2016-03-25 15:57:36 +01:00
Laurent Destailleur
80e10158a5
Add code comment
2016-03-25 15:57:29 +01:00
Laurent Destailleur
bb8e53deea
Revert "Fix regression"
...
This reverts commit 5cd5a3a5fb
2016-03-25 15:57:19 +01:00
Laurent Destailleur
88e5616622
Prepare code to be able to download ODT templates
2016-03-25 15:56:50 +01:00
Laurent Destailleur
5cd5a3a5fb
Fix regression
2016-03-25 15:56:44 +01:00
Laurent Destailleur
e30d717e00
Uniformize look
2016-03-25 15:56:27 +01:00
aspangaro
642d7473a8
FIX: Donation || Don't show project icon if fk_project is empty
2016-03-25 15:54:09 +01:00
Laurent Destailleur
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +01:00
BENKE Charlie
93158db1bb
FIX : add line of separation between left menu
...
otherwise we don't show the separate between lert menu block
2016-03-25 15:52:53 +01:00
Laurent Destailleur
a2e9832c8d
Revert "Corrected non-static usages of Form::multiselectarray function"
...
This reverts commit 0a53cdd88f
2016-03-25 15:34:43 +01:00
Laurent Destailleur
630f5a632d
Revert "Corrected non-static usages of Form::selectarray function"
...
This reverts commit 87cd6e1e40
2016-03-25 15:34:37 +01:00
Laurent Destailleur
68e06a4634
Revert "NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions"
...
This reverts commit 4d78932fe8
2016-03-25 15:34:23 +01:00
Laurent Destailleur
4dc6acafe0
Revert "NEW Converted Form::selectyesno to a static function"
...
This reverts commit 5a9e686bf9
2016-03-25 15:34:06 +01:00
Laurent Destailleur
2220f7f6f2
Revert "NEW Converted Form::formconfirm function to a static function and removed deprecated function Form::form_confirm"
...
This reverts commit a0926abd13
2016-03-25 15:31:28 +01:00
Laurent Destailleur
e7a02d77a6
Revert commit
2016-03-25 15:31:17 +01:00
Laurent Destailleur
8ecfca5a9e
Revert change that break compatiblity with 100% of modules
2016-03-25 15:26:46 +01:00
Laurent Destailleur
26de415b77
Revert commit that break compatibility of 100% of modules
2016-03-25 15:24:57 +01:00
Laurent Destailleur
46613cd72b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-03-25 14:50:00 +01:00
Laurent Destailleur
4ec41bc33b
NEW Can edit value date of a vat payment after recording it.
2016-03-25 14:49:48 +01:00
Laurent Destailleur
4e1b46feeb
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-03-25 14:42:30 +01:00
Laurent Destailleur
bdead30e75
FIX Missing function
2016-03-25 14:42:16 +01:00
BENKE Charlie
efa7761b34
Add : new translations
2016-03-24 13:48:45 +01:00
BENKE Charlie
54af96b21b
Add : BILL_NEVER_BE_CANCELED
...
In some case we don't want to allow cancel bill, forced to made an avoir
2016-03-24 11:38:05 +01:00
Andreas Pachler
0d308f74be
Added functionality to get project customer contact as contact_xx tags
2016-03-24 09:16:24 +01:00
aspangaro
bec5e5958a
NEW: Move HRM dictionary from module to core dictionaries
2016-03-24 06:28:12 +01:00
Juanjo Menent
9b1cfe4731
Merge pull request #4884 from simnandez/dolibarr-3510
...
NEW #3510 : Standardize module
2016-03-23 23:00:43 +01:00
Juanjo Menent
922c57da76
NEW #3510 : Standardize module
2016-03-23 22:45:04 +01:00
aspangaro
1712ad04cc
Debug works
2016-03-23 22:23:59 +01:00
aspangaro
252f37b363
NEW: Accountancy - Add category to manage the display of the income statement and the balance sheet
2016-03-23 21:36:52 +01:00
Regis Houssin
b38e75c404
Merge branch '3.8_fix_merge' into 3.9_fix_merge
2016-03-23 14:03:35 +01:00
fmarcet
b8bc881e5a
FIX: Email templates not compatible with Multicompany
...
Conflicts:
htdocs/admin/dict.php
2016-03-23 13:57:17 +01:00
fmarcet
84e5c8b437
FIX: Email templates not compatible with Multicompany
...
Conflicts:
htdocs/admin/dict.php
2016-03-23 13:56:06 +01:00
fmarcet
e2b4d39292
FIX: Email templates not compatible with Multicompany
...
Conflicts:
htdocs/admin/dict.php
2016-03-23 13:54:39 +01:00
fmarcet
52d88db5c3
FIX: Email templates not compatible with Multicompany
...
Conflicts:
htdocs/admin/dict.php
2016-03-23 13:53:18 +01:00
Juanjo Menent
a7581f8663
Merge pull request #4879 from aspangaro/4.0-p5
...
NEW: Accountancy Add a way to initialize chart of accounts
2016-03-23 12:55:07 +01:00
Juanjo Menent
1dce6a9abc
Merge pull request #4878 from aspangaro/4.0-p4
...
FIX: Accountancy Bank journal Fix some problem with other module
2016-03-23 12:53:34 +01:00
Juanjo Menent
a758d9d420
Merge pull request #4873 from aspangaro/4.0-p2
...
Add in migration file 3.9 - 4.0, a sql operation to delete old menu of expense report
2016-03-23 12:52:39 +01:00
aspangaro
923b5930ec
NEW: Accountancy Add a way to initialize chart of accounts
2016-03-23 06:05:48 +01:00
aspangaro
8aed039ad3
FIX: Accountancy Bank journal Fix some problem with other module
2016-03-22 22:32:02 +01:00
Laurent Destailleur
a2b3b24ca9
FIX Must not return error when vars does not exists
2016-03-22 22:01:07 +01:00
Laurent Destailleur
dd26ede0ef
Add code comment
2016-03-22 19:24:48 +01:00
Laurent Destailleur
54ac3c0a7b
Fix regression
2016-03-22 17:41:42 +01:00
Laurent Destailleur
95a45e8f87
Prepare code to be able to download ODT templates
2016-03-22 17:35:58 +01:00
Laurent Destailleur
ced1462b75
Fix regression
2016-03-22 16:59:54 +01:00
Alexis Algoud
c3bdc6372d
NEW allow project to be shared across entities
2016-03-22 16:48:51 +01:00
Laurent Destailleur
612aa0ab04
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-03-22 15:50:56 +01:00
Laurent Destailleur
f686ef1d04
Uniformize look
2016-03-22 15:50:35 +01:00
aspangaro
53f2a7a0ac
Merge remote-tracking branch 'Upstream/develop' into 4.0-p2
2016-03-22 12:58:40 +01:00
Laurent Destailleur
8189a5eadd
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-03-22 12:58:34 +01:00
aspangaro
72abdde912
Add in migration file 3.9 - 4.0, a sql operation to delete old menu of expense report
2016-03-22 12:57:45 +01:00
Laurent Destailleur
4f3f1eda7b
FIX Duplicate records into export
2016-03-22 12:55:29 +01:00
Laurent Destailleur
876484dfb5
FIX Duplicate records into export
2016-03-22 12:54:26 +01:00
Sebastien Bechet
82f74ceb38
Postgresql compatibility patch + cosmetic
2016-03-22 10:09:41 +01:00
Marcos García de La Fuente
89bd173c2f
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
2016-03-21 21:51:29 +01:00
Juanjo Menent
fbe34e9efc
Merge pull request #4860 from aspangaro/4.0-p2
...
NEW: Move Expense report menu from module to menu files
2016-03-21 21:27:55 +01:00
Juanjo Menent
c323948669
Merge pull request #4856 from marcosgdf/pdf-phpdoc-fix
...
Corrected PHPDoc blocks of pdf.lib.php functions and added typehinting in their parameters
2016-03-21 20:40:07 +01:00
aspangaro
3c09e67453
Merge remote-tracking branch 'Upstream/develop' into 4.0-p2
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
2016-03-21 20:38:17 +01:00
Juanjo Menent
19f6f7049d
Merge pull request #4850 from fentman/patch-2
...
Update main.lang
2016-03-21 20:31:25 +01:00
Juanjo Menent
022958c8ad
Merge pull request #4861 from aspangaro/4.0-p3
...
FIX: Some typo on auguria menu
2016-03-21 20:27:36 +01:00
Juanjo Menent
187a04854f
Merge pull request #4862 from marcosgdf/form-selectarray2
...
Corrected non-static usages of several Form functions
2016-03-21 20:21:29 +01:00
Juanjo Menent
5fabb7b1e1
Merge pull request #4865 from aspangaro/3.9-p20
...
FIX: Donation || Don't show project icon if fk_project is empty
2016-03-21 20:12:32 +01:00
aspangaro
8f1cbe9ed8
FIX: Donation || Don't show project icon if fk_project is empty
2016-03-21 12:59:30 +01:00
Laurent Destailleur
99ceb006e4
FIX Bad include and param for project numbering module call
2016-03-21 11:47:32 +01:00
phf
a6fa3a4c25
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_multicurrency_sync_rates
2016-03-20 21:58:24 +01:00
Laurent Destailleur
d4f5076a84
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-20 17:37:50 +01:00
Laurent Destailleur
706a7f05b8
FIX PHPCS
2016-03-20 17:37:27 +01:00
Laurent Destailleur
6b821f15d1
FIX Bad vat definition when using POS module
2016-03-20 17:36:13 +01:00
phf
600abc9794
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_multicurrency_sync_rates
2016-03-20 15:56:54 +01:00
phf
661ee72d55
UPDATE move ajax request in js file and call a new php file to update all rates
2016-03-20 15:17:30 +01:00
Marcos García de La Fuente
5a046125db
Missing changes from previous commits
2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
a0926abd13
NEW Converted Form::formconfirm function to a static function and removed deprecated function Form::form_confirm
2016-03-20 14:15:22 +01:00
Marcos García de La Fuente
5bdc3b9a1e
NEW Converted Form::selectyesno, Form::showrefnav, Form::select_date, Form::showbarcode, Form::showfilterAndCheckAddButtons, Form::editfieldkey, Form::editfieldnav, Form::editInPlace, Form::selectMassActions to static functions
2016-03-20 14:15:22 +01:00
Marcos García de La Fuente
5a9e686bf9
NEW Converted Form::selectyesno to a static function
2016-03-20 14:15:22 +01:00
Marcos García de La Fuente
ff6b187ef3
NEW Converted Form::showLinkedObjectBlock to a static function
2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
4d78932fe8
NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions
2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
0a53cdd88f
Corrected non-static usages of Form::multiselectarray function
2016-03-20 14:15:18 +01:00
Marcos García de La Fuente
87cd6e1e40
Corrected non-static usages of Form::selectarray function
2016-03-20 14:15:17 +01:00
aspangaro
0b1a689a24
FIX: Some typo on auguria menu
2016-03-20 08:08:28 +01:00
aspangaro
57ebb7c997
NEW: Move Expense report menu from module to menu files
2016-03-20 07:34:48 +01:00
Marcos García de La Fuente
eff5e2ebd7
Replaced old AccountNumber key with BankAccountNumber key
2016-03-19 23:02:09 +01:00
Marcos García de La Fuente
889c72611d
NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown
2016-03-19 23:00:33 +01:00
Laurent Destailleur
8689240b7f
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-19 21:37:08 +01:00
Laurent Destailleur
af3256f84a
Fix first change to fix serious pb with vat definition when using the
...
POS.
2016-03-19 21:35:03 +01:00
Marcos García de La Fuente
7fbf16a202
Fixed an error including FormBank class
2016-03-19 20:51:43 +01:00
Marcos García de La Fuente
59bfac65aa
Little refactor
2016-03-19 20:48:37 +01:00
Marcos García de La Fuente
8ef122ad99
Fixed missing require bug
2016-03-19 20:12:41 +01:00
Marcos García de La Fuente
39d17c0132
Corrected PHPDoc blocks of pdf.lib.php functions and added typehinting in their parameters
2016-03-19 20:05:13 +01:00
Marcos García de La Fuente
1be9c53b6c
NEW Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country
2016-03-19 19:39:18 +01:00
Laurent Destailleur
ba4f5c8648
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-19 19:26:57 +01:00
Laurent Destailleur
ee857055be
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-03-19 19:26:25 +01:00
Laurent Destailleur
660f825a34
Fix regression description line not visible
2016-03-19 19:25:28 +01:00
Laurent Destailleur
4436ec954f
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-03-19 19:15:23 +01:00
Laurent Destailleur
d09faadc24
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2016-03-19 19:14:03 +01:00
Laurent Destailleur
f0eb8ac794
Fix regression Product ref not visible
2016-03-19 19:13:27 +01:00
Laurent Destailleur
2639554cff
Clean css for POS. Start to move css into theme.
2016-03-19 18:46:44 +01:00
Michael Fenton
51125483aa
Update main.lang
...
Changing 'Quadri' to Quarter..
2016-03-19 20:03:26 +11:00
Laurent Destailleur
558d03c371
Add the "now" link on date to pay vat
2016-03-18 19:44:40 +01:00
Laurent Destailleur
101e5ae4c6
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-03-18 19:43:09 +01:00
Laurent Destailleur
b4e775dd35
FIX Parsing of amount to pay vat
2016-03-18 19:42:56 +01:00
Josep Lluís
31fa9221dd
Change of wrong key "Firsname" translation
...
Change of wrong key "Firsname" to "Firstname" for translation
2016-03-18 16:47:28 +01:00
Laurent Destailleur
bc377258e1
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-03-18 15:02:49 +01:00
Laurent Destailleur
6f8200893b
FIX #4784
2016-03-18 15:02:37 +01:00
Laurent Destailleur
5eef373ed6
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/compta/bank/search.php
htdocs/user/card.php
2016-03-18 14:56:44 +01:00
Laurent Destailleur
2f5c190060
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-03-18 14:53:27 +01:00
Laurent Destailleur
227e27bf4a
Merge pull request #4845 from simnandez/3.9
...
FIX: Can not select a commercial on the creation of a third
2016-03-18 14:17:08 +01:00
Laurent Destailleur
fb625f0ca7
FIX #4812
2016-03-18 13:58:06 +01:00
Juanjo Menent
875f4023de
FIX: Can not select a commercial on the creation of a third
2016-03-18 13:16:33 +01:00
Laurent Destailleur
97b630ac65
NEW Can use ^ and $ (to say start with or end with like regex syntax)
...
into search fields when search field is text. Bonus: ^$ can filter all
lines with field not defined.
2016-03-18 12:42:13 +01:00
Laurent Destailleur
c5e744bfc2
FIX #4839
2016-03-18 12:16:40 +01:00
BENKE Charlie
830f78b1c6
FIX : hookmanager must be init
...
Else we can't use is on additionnal modules
2016-03-18 11:55:41 +01:00
Laurent Destailleur
2b1f57f01e
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
dev/initdata/savedemo.sh
htdocs/filefunc.inc.php
htdocs/user/card.php
2016-03-18 11:54:14 +01:00
Laurent Destailleur
5edeeae384
FIX Bad error and style message when changing its own login
2016-03-18 11:30:15 +01:00
Laurent Destailleur
7fa71214bc
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
2016-03-18 11:06:41 +01:00
Florian HENRY
e3433cdfef
Merge remote-tracking branch 'origin/develop' into dev_jquery
2016-03-18 10:57:43 +01:00
Florian HENRY
371e593da3
better includes externel library
2016-03-18 10:56:55 +01:00
Laurent Destailleur
44dc07a61b
Merge pull request #4807 from bafbes/abb-13
...
added handle to trigger FICHINTER_ADD_CONTACT in notify module
2016-03-18 02:40:27 +01:00
Laurent Destailleur
a664aa9a06
Merge pull request #4811 from fappels/develop_patch_subprice
...
Update commande.class, subprice should be unit price without tax
2016-03-18 02:30:55 +01:00
Laurent Destailleur
c20124e369
Merge pull request #4829 from jtisseau/starttls
...
NEW Sending email can also use the STARTTLS protocol.
2016-03-18 00:48:13 +01:00
Laurent Destailleur
28638786b9
Merge pull request #4806 from bafbes/abb-12
...
constant FICHINTER_WITHOUT_DURATION to handle interventions without duration in lines
2016-03-18 00:39:43 +01:00
Laurent Destailleur
7692c39879
Merge pull request #4614 from bafbes/abb-3
...
include expense reports in linked objects section and provide template for them in this section
2016-03-18 00:26:24 +01:00
Laurent Destailleur
dc78cc7ced
Merge pull request #4837 from hregis/3.9_order
...
Fix: missing model selected
2016-03-18 00:10:30 +01:00
Laurent Destailleur
7e8e05d938
Merge pull request #4821 from FHenry/develop
...
NEW Update accoutancy with last dev
2016-03-18 00:08:00 +01:00
Laurent Destailleur
e201357907
Merge pull request #4817 from aspangaro/3.9-p19
...
Fix: 3.9 Problem of rowspan in edit mode on user card
2016-03-18 00:02:19 +01:00
Laurent Destailleur
18804ee929
FIX Bad color of message password changed
2016-03-18 00:01:14 +01:00
Laurent Destailleur
75ed221fb8
Fix regression with last PR: change of password was not working.
2016-03-17 23:58:04 +01:00
Laurent Destailleur
404ac60226
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-03-17 23:45:29 +01:00
Laurent Destailleur
bbcc7d83ea
Merge pull request #4834 from hregis/3.9_bug
...
Fix: beware with merges in conflict !!
2016-03-17 23:44:49 +01:00
Laurent Destailleur
e5f0027dbf
Merge pull request #4823 from ndrosis/3.9
...
FIX SQL syntax error in export
2016-03-17 23:37:23 +01:00
Laurent Destailleur
22f6e0e92d
Merge pull request #4831 from fmarcet/3.9
...
FIX: Not showing sellprice properly on product list
2016-03-17 23:33:05 +01:00
Laurent Destailleur
a102dc29d4
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-03-17 23:19:28 +01:00
Laurent Destailleur
fb16feb666
FIX Same term to create than other objects
2016-03-17 23:19:19 +01:00
Laurent Destailleur
76896e92a6
Merge pull request #4822 from atm-alexis/FIX_bad_function_name
...
FIX # Bad function name setEventMessagess call on project delete
2016-03-17 23:14:24 +01:00
Laurent Destailleur
c61110935d
Merge pull request #4803 from aspangaro/3.9-p17
...
FIX Missing language file loading
2016-03-17 23:13:47 +01:00
Laurent Destailleur
2c4f01859c
Merge pull request #4802 from grandoc/3.9
...
[fix]: define to avoid issue with external pdf models
2016-03-17 23:13:13 +01:00
Laurent Destailleur
cd687f57d6
NEW Can change type of extrafields for some combinations.
2016-03-17 21:58:51 +01:00
Alexis Algoud
19e3c1b089
FIX finished parameters not used
2016-03-17 16:35:23 +01:00
Regis Houssin
2642b710ea
Fix: missing model selected
2016-03-17 15:56:03 +01:00
Regis Houssin
a2bb57e33b
Fix: use clone instead dol_clone
2016-03-17 15:22:05 +01:00
Regis Houssin
ae16d6c45c
Fix: missing color update
2016-03-17 15:11:57 +01:00
Laurent Destailleur
aa7eb4935c
FIX VAT rate can be negative. Example spain selling to morroco.
2016-03-17 12:18:47 +01:00
Laurent Destailleur
1683609d9a
FIX Check of EAN13 barcode when mask was set to use 13 digits instead of
...
12
2016-03-17 12:00:38 +01:00
Laurent Destailleur
dfcd72399a
Missing translation
2016-03-17 11:37:07 +01:00
philippe grand
d434cee3fa
[Qual] Typo
2016-03-17 09:40:05 +01:00
Regis Houssin
d2d38f58bf
Fix: beware with merges in conflict !!
2016-03-17 09:22:12 +01:00
philippe grand
a196a76132
Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9
2016-03-17 09:21:32 +01:00
fmarcet
a1bc5dcc31
FIX: Not showing sellprice properly on product list
2016-03-16 16:35:07 +01:00
fmarcet
ad942afbf1
FIX: Not showing sellprice properly on product list
2016-03-16 16:30:59 +01:00
Laurent Destailleur
eb3ffb30c5
Add mongolian language
2016-03-16 11:29:56 +01:00
Laurent Destailleur
6269503888
Add es_EC and es_PA language
2016-03-16 11:23:00 +01:00
Laurent Destailleur
7528af5569
warning moved into info
2016-03-16 11:18:23 +01:00
jtisseau
969893a5b1
Adds multilanguage translations for MAIN_MAIL_EMAIL_STARTTLS
...
Adds the translations for all languages having the MAIN_MAIL_EMAIL_TLS
const defined. It's just a copy of this last one changing the "(SSL)" by
"(STARTTLS)".
2016-03-16 02:23:06 +01:00
jtisseau
a98e19a143
Adds a STARTTLS option
...
Adds a STARTTLS authentification option. This is used by Microsoft
Hotmail and Exchange. This commit includes a new constant named
MAIN_MAIL_EMAIL_STARTTLS, a view and edit view for it and the edit
action needed to modify value in DB. It also updates the js function
initFields to make it behave like the standard TLS option and adds two
jQuery function respectively to set TSL off when STARTTLS is selected
and to set STARTTLS off when TLS is selected. Unselecting one of those
won"t select the other.
2016-03-16 02:09:55 +01:00
jtisseau
d7b0e41271
Added the STARTTLS connection mode
...
Adds the STARTTLS connection mode in function _server_authenticate. It's
use by Microsoft Hotmail and Exchange servers. I use the
MAIN_MAIL_EMAIL_STARTTLS const introduced in admins/mails.php retrieved
from the $conf object which is not used anywhere else in the file so it
may not be the right way to do it. Maybe this value should be passed in
constructor but it would then imply more changes around multiple files
calling smtps class.
2016-03-16 01:54:45 +01:00
Laurent Destailleur
1ded08abef
FIX When using option Price per level, when adding a predefined product,
...
the vat for customer was not correctly set.
2016-03-15 21:02:45 +01:00
Laurent Destailleur
0f65251615
Missing class fielddeliverydelay
2016-03-15 19:38:01 +01:00
Florian HENRY
781059bbb7
add missing lib
2016-03-15 11:59:43 +01:00
Florian HENRY
28391a4e4d
Last version of JQuery 1.12 and DataTables Componenent with working
...
export Excel,CVS,PDF, etc..
2016-03-15 11:57:53 +01:00
Drosis Nikos
610249068d
Fix syntax
...
SQL error when ordering product list
2016-03-15 12:48:46 +02:00
Alexis Algoud
19d7577267
FIX Bad function name call on delete
2016-03-15 11:14:51 +01:00
philippe grand
ac1b4a90de
Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9
2016-03-15 10:24:01 +01:00
Florian HENRY
72b9b9876f
travis
2016-03-15 10:15:45 +01:00
Florian HENRY
6fd218c9aa
accoutancy
2016-03-15 09:01:02 +01:00
Florian HENRY
c380faacce
Accountancy
2016-03-15 08:58:53 +01:00
aspangaro
4167663491
Fix: 3.9 Problem of rowspan in edit mode
2016-03-15 06:53:17 +01:00
Laurent Destailleur
ed9cd71eac
css enhancement
2016-03-15 00:54:55 +01:00
Laurent Destailleur
dae41e6dd3
FIX Only active users are visible into agenda view "per user"
2016-03-15 00:54:45 +01:00
Laurent Destailleur
77ae5c668a
Can see rest of available leaves request in read only mode if we don't
...
have permission to edit.
2016-03-14 21:31:22 +01:00
Laurent Destailleur
d4c6c4c140
NEW Holiday is a RH module. All RH module provides by default visilibity
...
on users of its hierarchy.
2016-03-14 21:22:49 +01:00
Laurent Destailleur
12bb3932d0
NEW Add filter on a keyword, status and nature into list of modules
2016-03-14 19:40:52 +01:00
fappels
437470c3d9
subprice should be unit price without tax
2016-03-14 17:27:12 +01:00
Laurent Destailleur
77e4fb1883
Fix style
2016-03-14 16:01:27 +01:00
Laurent Destailleur
08c5fd2e36
FIX #4809 - Duplicate functions with different content
2016-03-14 14:38:30 +01:00
Laurent Destailleur
619ebf9a3e
Enhance css of search fields
2016-03-13 20:38:16 +01:00
Laurent Destailleur
77c81397ea
Version 3.9 final
2016-03-13 20:17:49 +01:00
abb
d35f728fad
added handle to trigger FICHINTER_ADD_CONTACT in notify module
2016-03-13 19:58:39 +01:00
abb
42eba7270d
new:constant FICHINTER_WITHOUT_DURATION to handle interventions without duration in lines
...
Conflicts:
htdocs/fichinter/card.php
2016-03-13 19:49:30 +01:00
Laurent Destailleur
5ce7e70097
Clean css
2016-03-13 14:39:41 +01:00
aspangaro
5d88c10e94
Missing language file
2016-03-13 08:33:34 +01:00
Laurent Destailleur
543f5cef63
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
dev/initdata/initdemo.sh
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/commande/card.php
htdocs/compta/facture.php
2016-03-13 01:31:12 +01:00
Laurent Destailleur
a5571b1040
NEW Show a badge with number of withdraw requests done on the withdraw
...
tab of invoice.
2016-03-13 01:20:54 +01:00
Laurent Destailleur
f345ff7300
Fix regression on vat calculation when invoice was not a situation
...
invoice
2016-03-13 01:11:42 +01:00
phf
0a533660b8
Fix travis phpcs
2016-03-12 21:17:09 +01:00
philippe grand
adc552d5ff
Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9
2016-03-12 20:52:09 +01:00
Laurent Destailleur
1b30c1adb4
Fix regression on vat calculation when invoice was not a situation
...
invoice
2016-03-12 20:49:38 +01:00
philippe grand
df1c5697be
[fix]: define to avoid issue with external pdf models
2016-03-12 19:07:56 +01:00
Laurent Destailleur
e0809fc750
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
ChangeLog
build/makepack-dolibarr.pl
htdocs/compta/facture.php
htdocs/product/document.php
2016-03-12 18:40:50 +01:00
Laurent Destailleur
bad07bc38c
Fix dos and bom and end of line
2016-03-12 18:30:19 +01:00
Laurent Destailleur
ba8e11d521
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-03-12 18:26:16 +01:00
Laurent Destailleur
368b4c621f
Fix phpcs
2016-03-12 18:25:41 +01:00
Laurent Destailleur
7b576b634a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-03-12 18:25:16 +01:00
Laurent Destailleur
58988e4ad2
Fix not visible menu title
2016-03-12 18:22:44 +01:00
Laurent Destailleur
2e3b4c3748
Fix not visible menu title with small screen
2016-03-12 16:24:33 +01:00
phf
cc21f75c47
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_multicurrency_sync_rates
2016-03-12 13:16:22 +01:00
Laurent Destailleur
dca5e5278b
Merge pull request #4736 from marcosgdf/bankcateg-oop
...
NEW Moved code that deals with bank categories to BankCateg. Created BankCateg::fetchAll function
2016-03-12 12:01:32 +01:00
Laurent Destailleur
8cdc80bfb4
Merge pull request #4787 from grandoc/develop
...
[Qal] uniformize code
2016-03-12 11:52:57 +01:00
Laurent Destailleur
e3df749666
Merge pull request #4796 from hregis/3.8_bug
...
Fix: wrong fk_parent_line in credit note with invoiceAvoirWithLines
2016-03-12 11:47:05 +01:00
Laurent Destailleur
1527036565
Merge pull request #4798 from FHenry/develop
...
accoutancy fix error messages
2016-03-12 11:45:23 +01:00
phf
3134af5013
Fix sync with currencylayer
2016-03-11 23:42:02 +01:00
Laurent Destailleur
444fce0bd9
Prepare 3.7.4
2016-03-11 18:34:05 +01:00
Regis Houssin
7953f77b07
Fix: $fileparams is not defined
2016-03-11 18:08:27 +01:00
Laurent Destailleur
7c950be468
Fix Phpcs
2016-03-11 18:04:45 +01:00
Florian HENRY
d7065751a1
fix error messages
2016-03-11 17:18:25 +01:00
Florian HENRY
33c5658209
fix error return
2016-03-11 17:17:06 +01:00
Regis Houssin
f87bb1206e
Fix: wrong fk_parent_line in credit note with invoiceAvoirWithLines
...
option
2016-03-11 15:42:14 +01:00
Laurent Destailleur
7dac7c4f04
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-11 11:00:53 +01:00
Laurent Destailleur
8b16a76936
Avoid duplicate translation
2016-03-11 10:59:28 +01:00
Laurent Destailleur
a9058df753
Fix bad field in select
2016-03-11 10:47:17 +01:00
phf
da17e6e676
New add sync with api to create/update all rates
2016-03-10 23:52:06 +01:00
Marcos García de La Fuente
39f915d95d
Reverted use of BankCateg in Bank category listing
2016-03-10 19:52:27 +01:00
Laurent Destailleur
7a5353efb2
Make things clearer about option MAIN_ENABLE_LOG_TO_HTML
2016-03-10 18:36:09 +01:00
Laurent Destailleur
a8602dbec2
Fix alignement on extrafields
2016-03-10 16:00:44 +01:00
philippe grand
b495fdb58e
[Qal] uniformize code
2016-03-10 15:51:31 +01:00
Laurent Destailleur
2e1a63a1f3
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/langs/de_DE/companies.lang
htdocs/langs/fr_FR/compta.lang
htdocs/societe/class/societe.class.php
htdocs/societe/commerciaux.php
htdocs/societe/consumption.php
2016-03-10 15:09:30 +01:00
Laurent Destailleur
3b035819a9
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
htdocs/product/document.php
htdocs/societe/commerciaux.php
2016-03-10 15:03:53 +01:00
Laurent Destailleur
d6f3a5c046
Fix bad path
2016-03-10 15:01:39 +01:00
Laurent Destailleur
cddb54207f
Merge pull request #4769 from FHenry/develop
...
Extend element type of action comm (for long name external modules)
2016-03-10 14:12:11 +01:00
Laurent Destailleur
2d1c56cfaa
Merge pull request #4754 from defrance/patch-107
...
FIX : only enabled society is used for product select
2016-03-10 13:56:25 +01:00
Laurent Destailleur
ecf47109c0
Merge pull request #4739 from marcosgdf/accountline-oop
...
NEW Created AccountLine::insert function and started using it for transaction creation
2016-03-10 13:55:07 +01:00
Laurent Destailleur
79989c2f65
Merge pull request #4741 from marcosgdf/account-oop-properties
...
Fixed wrong Account class property used in bank/card.php
2016-03-10 13:53:17 +01:00
Laurent Destailleur
d663b28dac
Fix no database structure change is allowed into minor versions
2016-03-10 13:49:13 +01:00
Laurent Destailleur
f742d4ec66
Fix code corrupting database
2016-03-10 13:46:52 +01:00
Laurent Destailleur
80805f78ea
Disable too dangerous patch. Fix must be done by doing an insert only
...
without creating/renaming databases.
2016-03-10 13:43:09 +01:00
Laurent Destailleur
9463b26476
Merge pull request #4774 from marcosgdf/bug-multiprice
...
Fixes a little problem with multiprice rules, now undefined ones evaluate to 0% variation
2016-03-10 13:35:27 +01:00
Laurent Destailleur
3d131de35c
Merge pull request #4778 from marcosgdf/bug-4777
...
FIX #4777 Error creating thirdparty with PostgreSQL
2016-03-10 13:34:34 +01:00
Laurent Destailleur
45ab31815b
Merge pull request #4767 from grandoc/3.9
...
fix : missing translation
2016-03-10 13:34:09 +01:00
Laurent Destailleur
21bf8824b9
Merge pull request #4738 from marcosgdf/account-libstatut
...
Refactored Account::libStatut and added object typehinting to some functions of Account class
2016-03-10 13:29:02 +01:00
Laurent Destailleur
155fd71f6d
Merge pull request #4734 from fappels/develop
...
Fix: add require to showDimensionInBestUnit
2016-03-10 13:22:58 +01:00
Laurent Destailleur
4fa84c8d8f
Merge pull request #4707 from marcosgdf/misc2
...
Removed deprecated usage of Account::account_currency_code and started using Account::canBeReconciliated
2016-03-10 13:21:51 +01:00
Laurent Destailleur
a61882d847
Sync transifex
2016-03-10 12:44:05 +01:00
Laurent Destailleur
a12d81cbda
Fix PHPCS
2016-03-10 12:36:25 +01:00
Florian HENRY
b58e155a6f
FIX : #4785
2016-03-10 12:22:49 +01:00
Laurent Destailleur
5bd5323c93
Finished to move the mergepdftool dedicated page into the generic "mass
...
actions" feature.
2016-03-10 12:11:11 +01:00
Florian HENRY
bb06356afb
qs
2016-03-10 11:43:07 +01:00
Florian HENRY
e40de3ce28
fix accoutancy
2016-03-10 11:39:26 +01:00
Florian HENRY
6138da8db6
Extend element type of action comm (for long name external modules)
2016-03-10 11:39:26 +01:00
Laurent Destailleur
d0441fa05f
NEW: Show into badge on tab head the number of dedicated contacts for
...
objects.
2016-03-10 11:16:12 +01:00
Laurent Destailleur
ba5b0efb53
The warning for late orders is visible on order card
2016-03-10 10:53:01 +01:00
philippe grand
6aa10a84df
Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9
2016-03-10 09:01:11 +01:00
Laurent Destailleur
e0681d0165
Fix unit not visible if not defined
2016-03-09 23:20:44 +01:00
Laurent Destailleur
8ab343e95f
Can choose number of decimals into function showDimensionInBestUnit
2016-03-09 23:17:46 +01:00
Marcos García de La Fuente
199597f93a
FIX #4777 Error creating thirdparty with PostgreSQL
...
Close #4777
2016-03-09 14:46:09 +01:00
Laurent Destailleur
c907ca85c9
Fix css
2016-03-08 20:32:41 +01:00
Laurent Destailleur
043abdce03
Fix sql error
2016-03-08 20:30:09 +01:00
Laurent Destailleur
4b0b1fb5f6
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/societe/consumption.php
2016-03-08 20:29:10 +01:00
Laurent Destailleur
e0cef69685
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-08 20:21:42 +01:00
Laurent Destailleur
9f3f477877
FIX Navigation in result
2016-03-08 20:21:16 +01:00
Laurent Destailleur
881eca9fe5
Fix search on product ref
2016-03-08 19:46:42 +01:00
Laurent Destailleur
09a29322c3
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/list.php
htdocs/commande/orderstoinvoice.php
htdocs/public/demo/index.php
htdocs/societe/commerciaux.php
2016-03-08 17:40:21 +01:00
Laurent Destailleur
6d9bec9de1
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-03-08 17:32:00 +01:00
Laurent Destailleur
71246c864a
FIX Bad td balance and default checkbox value
2016-03-08 17:31:46 +01:00
Marcos García de La Fuente
d43d0bfec1
Fixes a little problem with multiprice rules, now undefined ones evaluate to 0% variation
2016-03-08 12:16:32 +01:00
Florian HENRY
4bf2da4af7
revert SQL changes
2016-03-08 10:24:59 +01:00
Florian HENRY
a8e2b49c5b
FIX : #4768
2016-03-08 10:22:31 +01:00
Laurent Destailleur
a6fcab96e3
Better contrast in thumb of demo page
2016-03-08 10:03:51 +01:00
philippe grand
44d71c2bb4
fix : missing translation
2016-03-08 09:08:31 +01:00
Benlo
0166d2ec3a
FR4763 add possibility to export contacts/thirdparty categories
2016-03-07 17:49:26 +01:00
Marcos García de La Fuente
08d27b7148
Refactored Account::LibStatut function
2016-03-07 11:31:16 +01:00
Florian HENRY
002a3888f4
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2016-03-07 10:57:46 +01:00
BENKE Charlie
e455a2c9a8
only enabled society is used for product select
2016-03-07 08:25:21 +01:00
Marcos García de La Fuente
66f71d16d9
Fixed wrong Account class property used in bank/card.php
2016-03-06 19:59:37 +01:00
Juanjo Menent
9865b0daa3
Merge pull request #4735 from aspangaro/3.9-p16
...
Fix: 3.9rc2 Show accountancy account ventilated instead of the rowid of the account
2016-03-06 14:46:24 +01:00
Juanjo Menent
7a65ebe2b4
Merge pull request #4733 from grandoc/3.8
...
3.8
2016-03-06 14:45:48 +01:00
Juanjo Menent
5fb6db9da3
Merge pull request #4732 from hregis/3.8_bug
...
Fix: compatibility with multicompany transversal mode
2016-03-06 14:45:21 +01:00
Laurent Destailleur
894953c275
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-03-06 12:40:11 +01:00
Laurent Destailleur
3dbe27030e
FIX If all banks account are reconcilable to off, we must not show nb of
...
transactions to reconciles.
FIX Switching status reconcile on-off was broken.
2016-03-06 12:39:59 +01:00
Laurent Destailleur
896f60a478
hidden solution to solve files overwriting each other
2016-03-06 00:47:00 +01:00
Laurent Destailleur
886aa1f8b6
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2016-03-06 00:39:25 +01:00
Laurent Destailleur
210d8435da
FIX The part added with hidden option MAIN_DOC_USE_TIMING was included
...
with a . instead of -. This make os think it is part of extension
instead of file name.
2016-03-06 00:39:13 +01:00
Marcos García de La Fuente
ed51a42963
NEW Created AccountLine::insert function and started using it for transaction creation
2016-03-05 16:26:30 +01:00
Marcos García de La Fuente
4f569279d6
Refactored Account::libStatut and added object typehinting to some functions of Account class
2016-03-05 16:14:41 +01:00
Marcos García de La Fuente
0fd9518ad0
NEW Moved code that deals with bank categories to BankCateg. Created BankCateg::fetchAll function
...
Also replaced spaces with tabs and applied PSR-2 beautifier to the code
2016-03-05 15:51:02 +01:00
Laurent Destailleur
c007dcc966
Replace function rand with mt_rand (prepare php 8)
2016-03-05 15:02:13 +01:00
Laurent Destailleur
d1777a6783
Replace function rand with mt_rand (prepare php 8)
2016-03-05 15:01:25 +01:00
Marcos García de La Fuente
6184c71181
Corrected comparison of Account::canBeConciliated output
2016-03-05 14:05:00 +01:00
Laurent Destailleur
d8045e33bb
FIX Option FCKEDITOR_ENABLE_MAIL was no used into dictionnary page to
...
edit email templates
2016-03-05 12:37:09 +01:00
Laurent Destailleur
446a080c75
NEW Mutualize code to manage email substitution variables. Show
...
available variables into page to edit email templates.
2016-03-05 12:20:58 +01:00
fappels
61bd7b330f
Revert "Update commande.class.php"
...
This reverts commit 266f1e2acd
2016-03-05 11:44:35 +01:00
Laurent Destailleur
15ecf98bcb
Fix responsive on smartphone
2016-03-05 02:11:20 +01:00
Laurent Destailleur
7a1af17585
FIX Responsive of demo selection page was not working
2016-03-05 01:40:52 +01:00
Laurent Destailleur
90ce3e6309
FIX Responsive of demo selection page was not working
2016-03-05 01:39:22 +01:00
Laurent Destailleur
144c410b52
Add var commented into conf file
...
Fix disabled of module for demo
2016-03-05 01:38:14 +01:00
Laurent Destailleur
74f9ed029c
Code comment
2016-03-05 01:37:05 +01:00
Laurent Destailleur
66a95be78a
custom dir seems stable enough to be on by default.
2016-03-05 00:09:08 +01:00
aspangaro
ae472b932c
Fix: 3.9rc2 Show accountancy account ventilated instead of the rowid of the account
2016-03-04 20:45:47 +01:00
Francis Appels
266f1e2acd
Update commande.class.php
...
subprice should be pu without tax
2016-03-04 20:02:03 +01:00
Francis Appels
0890f20a72
Update functions.lib.php
...
Add product.lib for function measuring_units_string
2016-03-04 19:29:08 +01:00
Regis Houssin
5292920a84
Fix: don't see the sales representative of anothers entities
2016-03-04 17:10:42 +01:00
Regis Houssin
735a1c075e
Fix: best sql request
2016-03-04 16:48:53 +01:00
philippe grand
8ba8182c64
Merge branch '3.8' of https://github.com/Dolibarr/dolibarr.git into 3.8
2016-03-04 16:32:33 +01:00
Laurent Destailleur
109eefaf03
Merge pull request #4723 from IonAgorria/default-date-selector
...
New: Default values in date selector
2016-03-04 16:31:42 +01:00
philippe grand
bd0320dea0
fix : missing traduction
2016-03-04 16:30:47 +01:00
Laurent Destailleur
cbd102fa45
Merge and rename method into camel format
2016-03-04 16:28:38 +01:00
Laurent Destailleur
6e8b176d8d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-03-04 16:24:03 +01:00
Laurent Destailleur
87093c79f9
Merge pull request #4708 from marcosgdf/account-constants
...
Started using Account TYPE and STATUS constants
2016-03-04 16:23:50 +01:00
Laurent Destailleur
0f9afea1cc
Merge pull request #4731 from IonAgorria/unset-date-post
...
Fix: unset date start/end at success
2016-03-04 16:20:10 +01:00
Laurent Destailleur
c940d2de60
Merge pull request #4729 from IonAgorria/fix-dynprice-supplier
...
Fix: dynamic price parser and button not using selected expression
2016-03-04 16:19:41 +01:00
Laurent Destailleur
a73b53ff9c
Merge pull request #4728 from atm-ph/fix_send_mail_from_thirdparty
...
Fix can't send mail to thirdparty contact if no mail defined on thirdparty card
2016-03-04 16:18:15 +01:00
Laurent Destailleur
4ae3fe6318
Merge pull request #4726 from atm-maxime/develop
...
New : add button to create event on supplier order or invoice
2016-03-04 16:17:38 +01:00
Laurent Destailleur
83ababeeac
Merge pull request #4727 from hregis/3.8_fichinter
...
Fix: wrong modelpdf var name
2016-03-04 16:17:16 +01:00
Laurent Destailleur
fe13fe06ac
Merge pull request #4724 from frederic34/patch-7
...
Update html.formfile.class.php
2016-03-04 16:15:53 +01:00
Laurent Destailleur
36474eabec
NEW Add stats and late records into dashboard for supplier proposals.
2016-03-04 16:14:23 +01:00
Laurent Destailleur
c63ee8ceb5
Debug module supplier proposal
2016-03-04 16:08:51 +01:00
Regis Houssin
967ae720ef
Fix: compatibility with multicompany transversal mode
2016-03-04 15:51:34 +01:00
Laurent Destailleur
f06911a8b0
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/langs/fr_FR/admin.lang
htdocs/societe/commerciaux.php
2016-03-04 15:39:55 +01:00
Laurent Destailleur
ca1860a08b
Merge pull request #4720 from hregis/3.8_bug
...
Fix: compatibility with multicompany transversal mode and more security issue
2016-03-04 15:34:24 +01:00
Laurent Destailleur
cb7ae31c65
Merge pull request #4722 from grandoc/develop
...
fix : missing translation
2016-03-04 15:31:42 +01:00
Laurent Destailleur
fcb8c09414
Merge pull request #4721 from grandoc/3.9
...
fix : missing translation
2016-03-04 15:31:35 +01:00
Laurent Destailleur
4ea00fe1c5
Merge pull request #4725 from aspangaro/3.9-p15
...
Fix: 3.9rc2 Show accountancy account ventilated instead of the rowid of the account
2016-03-04 15:31:25 +01:00
Laurent Destailleur
c00860fdd5
Merge pull request #4719 from hregis/3.9_holiday
...
Fix: best compatibility with multicompany and others security issue
2016-03-04 15:30:18 +01:00
Laurent Destailleur
b6fd2a665e
Merge pull request #4718 from grandoc/3.8
...
fix : missing translation
2016-03-04 15:22:04 +01:00
Laurent Destailleur
e92318bc13
Better fix to manage several level of beta and rc
2016-03-04 15:21:26 +01:00
Laurent Destailleur
84d2078919
Merge pull request #4710 from hregis/3.9_bug
...
Fix: issue during upgrade of MAIN_VERSION_LAST_UPGRADE (rc -> rc2)
2016-03-04 15:18:59 +01:00
Laurent Destailleur
9ffaf9b218
Merge remote-tracking branch 'origin/3.7' into 3.8
2016-03-04 14:51:59 +01:00
Laurent Destailleur
e7511dd267
Fix consistency into data for time spent on tasks
2016-03-04 14:27:05 +01:00
Ion Agorria
a1159b6f29
Fix: unset date start/end at success
2016-03-04 14:11:06 +01:00
Laurent Destailleur
e60088a297
Add parameter moreinheader
2016-03-04 13:30:00 +01:00
Ion Agorria
2bca2b278a
Fix parser and button not using selected expression
2016-03-04 13:03:07 +01:00
phf
e03f4b4de9
Fix can't send mail to thirdparty contact if no mail defined on thirdparty card
2016-03-04 12:21:14 +01:00
Regis Houssin
f9d8aba325
Fix: wrong modelpdf var name
2016-03-04 11:48:46 +01:00
Laurent Destailleur
b75f896b45
NEW Into GED module, filename is truncated only if there is not enough
...
space into table
2016-03-04 11:25:54 +01:00
Maxime Kohlhaas
db656ea4ca
New : add button to create event on supplier order or invoice with MAIN_ADD_EVENT_ON_ELEMENT_CARD
2016-03-04 10:38:33 +01:00
aspangaro
8536841ada
Fix: 3.9rc2 Show accountancy account ventilated instead of the orwid of the account.
2016-03-04 10:27:34 +01:00
Laurent Destailleur
fba3970835
Fix missing loading lang
2016-03-04 01:09:31 +01:00
Ion Agorria
4300ca8bdc
Use isset instead of !empty in default date
2016-03-04 00:50:47 +01:00
Laurent Destailleur
453466f23f
Fix draft invoice must be destroyed once converted into template
2016-03-03 21:14:20 +01:00
Laurent Destailleur
bc2043cb79
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-03 20:48:47 +01:00
Laurent Destailleur
14ab10328c
Minor fixes
2016-03-03 20:48:11 +01:00
Laurent Destailleur
071ca6d1c4
Fix enable/disabled contract
2016-03-03 20:46:42 +01:00
Laurent Destailleur
8ea7effac6
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2016-03-03 20:42:12 +01:00
Laurent Destailleur
09a9546c14
FIX Can not disabled an opened service line in a contract
2016-03-03 20:41:56 +01:00
Laurent Destailleur
99553c8230
FIX Can not disable an opened service on a contract
2016-03-03 20:39:38 +01:00
Laurent Destailleur
974879ea9d
NEW Disabled users are striked.
2016-03-03 20:20:04 +01:00
Laurent Destailleur
7dc5fd334f
Italian vat to 22
2016-03-03 19:21:17 +01:00
Frédéric FRANCE
902eba67d2
Update html.formfile.class.php
2016-03-03 17:12:16 +01:00
philippe grand
6851c3fdb0
fix : missing translation
2016-03-03 16:18:07 +01:00
Ion Agorria
6feaaf906c
NEW: Configurable default hour and min in date start/end
2016-03-03 16:11:42 +01:00
philippe grand
4a3509d350
fix : missing translation
2016-03-03 16:09:19 +01:00
philippe grand
74601a0b1d
fix : missing translation
2016-03-03 16:01:50 +01:00
philippe grand
9e80a37947
fix : missing translation
2016-03-03 15:45:42 +01:00
Ion Agorria
7db306ba77
NEW: Configurable default hour and min in date selector
2016-03-03 14:51:34 +01:00
Laurent Destailleur
40144eee8d
NEW linked object can show now the recurring invoices with other linked
...
objects.
2016-03-03 13:38:16 +01:00
Laurent Destailleur
3cbeca26e7
NEW When creating a template invoice from a draft invoice, if there is
...
link to contract on draft invoice, link is kept on template invoice.
2016-03-03 13:16:46 +01:00
Laurent Destailleur
d842d05639
Fix bug in date compare
2016-03-03 12:31:29 +01:00
Laurent Destailleur
f3745511fd
Fix missing translation
2016-03-03 12:15:17 +01:00
Laurent Destailleur
aa34dffef5
Search on select list is supported for extra fields
2016-03-03 12:09:13 +01:00
philippe grand
ba2c0db159
fix : missing translation
2016-03-03 12:00:08 +01:00
philippe grand
9f798bc3fc
fix : missing translation
2016-03-03 11:54:12 +01:00
Laurent Destailleur
360e202582
Add fields to search on extrafields
2016-03-03 11:39:13 +01:00
Laurent Destailleur
fd2166ed11
Minor enhancement on new recurring invoice generation
2016-03-03 10:42:49 +01:00
Regis Houssin
6fd5334812
Fix: compatibility with multicompany transversal mode and more security
...
issue
2016-03-03 10:10:55 +01:00
Laurent Destailleur
b1c1de422f
Enhance look of cron job list
2016-03-03 10:05:40 +01:00
Regis Houssin
25686e82c9
Fix: best compatibility with multicompany and others security issue
2016-03-03 08:49:24 +01:00
Laurent Destailleur
3a58613e45
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/listbyyear.php
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/projet/activity/index.php
2016-03-02 23:40:11 +01:00
Laurent Destailleur
3b70bbb05a
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/lib/admin.lib.php
2016-03-02 23:07:42 +01:00
philippe grand
59c4559a78
fix : missing translation
2016-03-02 21:13:12 +01:00
Laurent Destailleur
7fbfbfc804
Merge pull request #4716 from marcosgdf/bug-4453-2
...
FIX #4453 SEPA Direct Debit generated XML shows a trailing comma in RmtInf field
2016-03-02 20:59:08 +01:00
Laurent Destailleur
f7059d3490
Merge pull request #4712 from marcosgdf/bug-4434
...
FIX #4434 Weird behaviour when enabling multiprices
2016-03-02 20:56:03 +01:00
Laurent Destailleur
e50ab89bcd
Merge pull request #4711 from marcosgdf/bug-4425
...
FIX #4425 Missing "VAT" translation in supplier order popup
2016-03-02 20:55:21 +01:00
Frédéric FRANCE
222ce45e0c
Update 3.9.0-4.0.0.sql
2016-03-02 18:57:34 +01:00
Marcos García de La Fuente
6f5481896b
FIX #4453 SEPA Direct Debit generated XML shows a trailing comma in RmtInf field
...
Close #4453
2016-03-02 12:41:24 +01:00
Marcos García de La Fuente
7d336bd5d4
FIX #4414 Supplier invoices use FAC_FORCE_DATE_VALIDATION client invoices property
...
Close #4414
2016-03-02 11:43:55 +01:00
Marcos García de La Fuente
aa45734683
FIX #4434 Weird behaviour when enabling multiprices
...
Close #4434
2016-03-02 11:38:40 +01:00
Marcos García de La Fuente
123d6fb6e5
FIX #4425 Missing "VAT" translation in supplier order popup
...
Close #4425
2016-03-02 11:29:42 +01:00
Regis Houssin
057188e1de
Fix: comment debug lines
2016-03-02 11:26:43 +01:00
Regis Houssin
e9ac41fb24
Fix: issue during upgrade of MAIN_VERSION_LAST_UPGRADE (rc -> rc2)
2016-03-02 11:23:57 +01:00
Marcos García de La Fuente
e63ab857d8
FIX #4583 Incorrect call of Categories::containing throws a DoliDB error
...
Close #4583
2016-03-02 11:21:56 +01:00
Marcos García de La Fuente
b41016da70
Little refactor of FormBank::select_type_comptes_financiers
2016-03-02 11:12:41 +01:00
Marcos García de La Fuente
ff83dd9afe
Replaced account type comparisons with TYPE constants
2016-03-02 11:08:57 +01:00
Marcos García de La Fuente
dcde7773a3
Started using Account TYPE and STATUS constants
2016-03-02 11:04:52 +01:00
Marcos García de La Fuente
66313f584b
Removed deprecated usage of Account::account_currency_code and started using Account::canBeReconciliated
2016-03-02 10:52:54 +01:00
Laurent Destailleur
fd3b4f6080
Merge pull request #4703 from marcosgdf/oop-accountline3-1
...
Documented properties of Account class
2016-03-02 01:07:25 +01:00
Laurent Destailleur
f96511e187
Merge pull request #4699 from bafbes/abb-11
...
new:advanced permissions to validate and unvalidate interventions
2016-03-02 01:06:19 +01:00
Laurent Destailleur
215b24df54
Merge pull request #4701 from atm-alexis/FIX_contract_fourn_price_deleted_on_update
...
FIX contract line supplier data were deleted on update
2016-03-02 01:04:39 +01:00
Laurent Destailleur
d39dca21d7
Add franc guinéen in currency
2016-03-01 22:48:35 +01:00
Frédéric FRANCE
a58dda76ed
Update product.lib.php
2016-03-01 17:28:08 +01:00
Marcos García de La Fuente
e646f28c0a
Documented properties of Account class
2016-03-01 15:46:06 +01:00
Alexis Algoud
72b532b7eb
FIX non instanciated values
2016-03-01 11:31:27 +01:00
Laurent Destailleur
839b2074ce
Merge pull request #4696 from aspangaro/3.9-p14
...
Fix: 3.9rc2 Use getNomUrl to show account_parent instead of rowid of the accountancy account
2016-03-01 01:47:56 +01:00
Laurent Destailleur
724f06a5eb
Merge pull request #4694 from simnandez/3.9
...
FIX : Remove bad migration file for this version
2016-03-01 01:47:09 +01:00
Laurent Destailleur
2d6c2d4fa5
Merge pull request #4698 from fmarcet/3.8
...
FIX: Status filter don't work
2016-03-01 01:46:26 +01:00
Laurent Destailleur
a26f880843
Fix missing declarion of form
...
Fix by adding MAIN_USE_OLD_SEARCH_FORM to restore a way for backward
compatibility
Fix to have delay for payment term at least 1 day (to avoid immediate
warning after creation of an invoice)
2016-03-01 00:59:42 +01:00
Frédéric FRANCE
10d04e63c1
Update bonprelevement.class.php
2016-02-29 22:59:08 +01:00
abb
f9162aa444
new:advanced permissions to validate and unvalidate interventions
2016-02-29 19:16:09 +01:00
Laurent Destailleur
846d78dfba
FIX Edition of delay (nb of days) for payment term "Immediate" was
...
broken.
2016-02-29 15:43:00 +01:00
Laurent Destailleur
a3d4340b82
Fix useless truncation
2016-02-29 15:30:52 +01:00
Laurent Destailleur
64374bec00
Fix avoid wrapping in select2 combo list
2016-02-29 15:28:06 +01:00
Laurent Destailleur
b31fd917ab
Always show email field into popup of contact
2016-02-29 13:28:20 +01:00
Laurent Destailleur
c197ce31b6
NEW Add the admin info on combo of type of contact
2016-02-29 13:24:59 +01:00
Laurent Destailleur
972d95a3c6
Better translation for nature of contact
2016-02-29 13:21:09 +01:00
Florian HENRY
50decb35cd
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2016-02-29 11:11:37 +01:00
Laurent Destailleur
2eaa21ea5c
Fix minor css error (pixel size must have "px"). Compatibility with old
...
behaviour.
2016-02-29 10:50:52 +01:00
Laurent Destailleur
d2c71fbf8f
Fix alias name was visible twice.
2016-02-29 10:35:18 +01:00
Laurent Destailleur
21c7aacddb
Fix add hidden option INVOICE_DEFAULT_UNPAYED_SORT_ORDER to be able to
...
provide backward compatibility with old behaviour.
2016-02-29 10:29:32 +01:00
fmarcet
77490bff71
FIX: Status filter don't work
2016-02-29 10:07:48 +01:00
Laurent Destailleur
4b28dadd6e
More complete instruction to convert image to theme
2016-02-28 14:44:09 +01:00
Laurent Destailleur
b7e0faa332
More complete css
2016-02-28 14:01:21 +01:00
Laurent Destailleur
be9a144433
FIX Add a test to show bugged module with a bad declaration of
...
dictionaries to avoid to see clean module to be breaked.
2016-02-28 12:43:00 +01:00
Laurent Destailleur
1df8e50a1b
NEW Add statistics on number of projets on home page
2016-02-28 00:19:12 +01:00
Laurent Destailleur
2ee74a80d9
NEW Enhance navigation of project module
2016-02-28 00:01:50 +01:00
Laurent Destailleur
39d6d16c02
Fix bad picto "shared project"
2016-02-27 19:20:11 +01:00
Laurent Destailleur
6b7551c5d2
Fix: Introduce hidden option to disable feature than hangs when too much
...
data
2016-02-27 19:12:45 +01:00
Laurent Destailleur
193699a1b3
Fix duration format
2016-02-27 18:47:02 +01:00
Laurent Destailleur
d644a3bc43
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-02-27 18:43:50 +01:00
Laurent Destailleur
1038e92354
FIX sql request and total for time spen for current month
2016-02-27 18:42:57 +01:00
Laurent Destailleur
5453f99e2e
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/comm/prospect/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
2016-02-27 18:33:39 +01:00
Laurent Destailleur
15503f12b9
FIX Removed a bugged list. Fixed another one to not count data of
...
previous year.
2016-02-27 18:29:01 +01:00
Laurent Destailleur
526ea743e0
Fix: the view my task must show only task you are assigned to
2016-02-27 17:56:59 +01:00
aspangaro
0136a1742e
Spaces !!!
2016-02-27 16:21:59 +01:00
aspangaro
ba6dadb6fa
Fix: Use getNomUrl to show account_parent instead of rowid of the account
2016-02-27 16:21:40 +01:00
Laurent Destailleur
88641a43a6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-02-27 16:18:00 +01:00
Laurent Destailleur
fe83a6595a
Remove duplicate translation keys
2016-02-27 16:17:49 +01:00
Laurent Destailleur
9b308b9f68
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2016-02-27 15:50:18 +01:00
Laurent Destailleur
4dd50460d3
Fix MAIN_THIRDPARTY_CREATION_INDIVIDUAL syntax error in name
2016-02-27 15:50:06 +01:00
aspangaro
1bf188db86
Fix: Double line
2016-02-27 14:34:32 +01:00
Laurent Destailleur
8807222f24
Fix a lot of fixes to have the french vat npr working better
2016-02-27 12:22:39 +01:00
Laurent Destailleur
997fd5ba5d
Fix do not show no price because e already have default
2016-02-27 11:59:51 +01:00
Laurent Destailleur
c86a1a30d5
Fix a lot of fixes to have the french vat npr working better
2016-02-27 11:46:16 +01:00
Juanjo Menent
cf932d6124
Merge remote-tracking branch 'upstream/3.9' into 3.9
2016-02-27 09:45:40 +01:00
Juanjo Menent
486488795a
FIX : Remove bad migration file for this version
2016-02-27 09:44:48 +01:00
Juanjo Menent
2af7d3a635
Merge pull request #4693 from simnandez/3.9
...
NEW : Add Malta VAT into 3.9
2016-02-27 09:42:44 +01:00
Juanjo Menent
77173344fe
NEW : Add Malta VAT into 3.9
2016-02-27 09:36:09 +01:00
Juanjo Menent
27b86be62b
Remove from 4.0
2016-02-27 09:29:28 +01:00
aspangaro
7233adcede
Merge remote-tracking branch 'Upstream/3.9' into 3.9-p13
2016-02-27 08:25:42 +01:00
aspangaro
c907cd139c
Lot of corrections
2016-02-27 08:15:58 +01:00
aspangaro
41fb60e4a2
Fixed: comestic correction of company card
2016-02-27 06:38:48 +01:00
Bahfir Abbes
4cbc1539b9
Fix: displays error when the supplier price does not exist.
2016-02-26 22:48:01 +01:00
Juanjo Menent
c2c6d77caa
FIX : Improve and add missing translations
...
As is not the branch develop, instead of transifex, we use GIT
2016-02-26 22:43:25 +01:00
Juanjo Menent
b34459c949
FIX : Improve and add missing translations
...
As is not the branch develop, instead of transifex, we use GIT
2016-02-26 22:31:36 +01:00
Juanjo Menent
7691e8c018
FIX : Improve and add missing translations
...
As is not the branch develop, instead of transifex, we use GIT
2016-02-26 22:17:22 +01:00
Juanjo Menent
673cf602e9
NEW Added Malta VAT into migration script
2016-02-26 20:12:39 +01:00
Juanjo Menent
852f82e55c
Merge pull request #4687 from defrance/patch-106
...
NEW add $scandir GETPOST
2016-02-26 19:52:46 +01:00
Laurent Destailleur
4cf59d3f9b
Fix if option WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER is on, we must
...
not show unpaid orders.
2016-02-26 19:13:25 +01:00
Laurent Destailleur
9a0af064bf
Prepare rc2
2016-02-26 19:05:02 +01:00
Laurent Destailleur
0f04075006
Few pixels won
2016-02-26 16:13:48 +01:00
Laurent Destailleur
23f45c7b7e
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/commande/list.php
htdocs/core/lib/pdf.lib.php
2016-02-26 15:45:25 +01:00
Laurent Destailleur
4250fe155a
Fix showing ref of shipment on orders (lines too long)
2016-02-26 15:42:07 +01:00
Laurent Destailleur
1fa94e4d6a
NEW Introduce position of records into dictionnary of type of contacts
2016-02-26 15:03:07 +01:00
Laurent Destailleur
a5554cc79e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-02-26 13:44:15 +01:00
Laurent Destailleur
c1ea597cb7
Redesign page with customer price to make it easier to understand.
2016-02-26 13:44:03 +01:00
fmarcet
30d6aa0b96
FIX: Some filters are lost when paging
2016-02-26 13:14:23 +01:00
Laurent Destailleur
2e25c7969b
Fix when setting a price for a product, selection of product must not
...
show any price
2016-02-26 12:22:32 +01:00
Laurent Destailleur
e115ac90ec
Code comment
2016-02-26 12:08:04 +01:00
BENKE Charlie
8c85f17379
Update supplier_invoice.php
2016-02-26 12:02:53 +01:00
BENKE Charlie
145a87030c
Update supplier_order.php
2016-02-26 12:01:55 +01:00
Florian HENRY
9ef5d02459
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2016-02-26 11:19:10 +01:00
Laurent Destailleur
16a716ebbc
Merge pull request #4655 from defrance/patch-103
...
ODT generation : No segment defined in odt file is not an error
2016-02-26 11:15:34 +01:00
Laurent Destailleur
952f88b79c
Merge pull request #4681 from defrance/patch-105
...
NEW Added Malta VAT
2016-02-26 10:56:03 +01:00
Laurent Destailleur
f330a1c8e5
Fix phpcs
2016-02-26 10:55:47 +01:00
Laurent Destailleur
7567336680
FIX #4683
2016-02-26 10:51:06 +01:00
Laurent Destailleur
b072b5a181
Fix remove some warnings
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2016-02-26 10:45:25 +01:00
Laurent Destailleur
61edda61e1
Fix remove some warnings
2016-02-26 10:38:42 +01:00
abb
5e2261c9bd
handle customer orders from supplier orders with id variable name correction
...
Conflicts:
htdocs/fourn/commande/card.php
2016-02-26 01:26:16 +01:00
Laurent Destailleur
4b4de22a54
NEW Add hook pdf_build_address
...
NEW Add option MAIN_PUBLIC_NOTE_IN_ADDRESS
2016-02-25 20:54:37 +01:00
Laurent Destailleur
54034ea852
NEW Add $object in parameter of pdf_build_address so we could include
...
hook into the function.
2016-02-25 18:30:31 +01:00
Laurent Destailleur
cdcad62967
FIX Array of linked elements for PDF contains duplicates and missing
...
data
2016-02-25 18:19:20 +01:00
Laurent Destailleur
0d6546e18e
NEW Add an explanation message on shipment page to explain you can't
...
make shipment if order is not validated
2016-02-25 18:18:33 +01:00
Laurent Destailleur
7fc58ddabc
FIX Array of linked elements for PDF contains duplicates and missing
...
data
2016-02-25 18:18:00 +01:00
Laurent Destailleur
8927948bef
NEW Add option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN
2016-02-25 16:27:28 +01:00
Laurent Destailleur
8c43276fda
FIX Extrafields of shipments was not included into export fields
2016-02-25 15:46:14 +01:00
BENKE Charlie
f0736a30a6
Added Malta VAT
...
Hope use it Soon ;-)
2016-02-25 14:53:06 +01:00
Laurent Destailleur
b3c3d3aac5
NEW Add total weight and volume on PDF
...
NEW Can hide column qty ordered.
2016-02-25 14:18:32 +01:00
Laurent Destailleur
a95240e33d
FIX Some troubles into weight and volume calculation when unit differs.
...
NEW Introduce a function showDimensionInBestUnit
2016-02-25 13:46:38 +01:00
Laurent Destailleur
59a6cb5f55
Fix bad support of option WORKFLOW_BILL_ON_SHIPMENT
...
Conflicts:
htdocs/commande/list.php
2016-02-25 03:06:37 +01:00
Laurent Destailleur
96305ca00f
Fix bad support of option WORKFLOW_BILL_ON_SHIPMENT
2016-02-25 03:04:36 +01:00
Laurent Destailleur
a5c3658f53
Fix bad formatting of order / shipment ref on PDF
2016-02-25 02:45:27 +01:00
Laurent Destailleur
f1ba81ec66
Fix bad formatting of order / shipment ref on PDF
2016-02-25 02:44:34 +01:00
Laurent Destailleur
b0f816a400
NEW Add weight/volume for one product into shipment export
2016-02-25 02:22:40 +01:00
Laurent Destailleur
9900620695
uniformize labels
2016-02-25 02:05:28 +01:00
Laurent Destailleur
1ba2407da4
Merge remote-tracking branch 'origin/3.9' into develop
2016-02-25 01:42:03 +01:00
Laurent Destailleur
773e5e3b0a
Fix: specific contact of object were lost when used to create invoice.
2016-02-25 01:03:37 +01:00
Laurent Destailleur
191394bf88
Fix: specific contact of object were lost when used to create invoice.
2016-02-25 01:02:11 +01:00
Laurent Destailleur
4b89b0b7aa
Fix bad status translation for shipment
2016-02-24 22:13:29 +01:00
Laurent Destailleur
6ee4637f35
Fix bad status translation for shipment
2016-02-24 22:12:38 +01:00
Laurent Destailleur
715b2024cd
Better repair script
2016-02-24 17:17:41 +01:00
Laurent Destailleur
0f49bb8645
Clean code
2016-02-24 17:09:04 +01:00
Laurent Destailleur
a2b81cebfd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-02-24 17:05:45 +01:00
Laurent Destailleur
9e8fcd19aa
Fix PHPCS
2016-02-24 17:05:34 +01:00
Laurent Destailleur
72059bb35b
Merge pull request #4677 from mrsof/patch-6
...
Fix: Fatal error: Class 'FormVentilation' not found
2016-02-24 16:58:15 +01:00
Laurent Destailleur
02c0f52880
NEW Include sales representative into export of thirdparties
2016-02-24 16:56:24 +01:00
Laurent Destailleur
33d5fa38ef
Fix pdfBuildThirdpartyName must return main name. Alias should be an
...
option.
2016-02-24 13:30:16 +01:00
Laurent Destailleur
513b46e1d4
NEW Can reopen an closed shipment
2016-02-24 13:19:25 +01:00
Laurent Destailleur
0f6e88b460
Update css of warehouse list
2016-02-24 12:18:24 +01:00
Laurent Destailleur
371dec8503
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
htdocs/langs/en_US/products.lang
htdocs/langs/fr_FR/companies.lang
2016-02-24 12:13:12 +01:00
Laurent Destailleur
490ef11eb5
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-02-24 12:10:35 +01:00
Laurent Destailleur
5d1241be2f
Sync transifex
2016-02-24 12:10:25 +01:00
Laurent Destailleur
2747259fbd
Fix: missing payment term and condition into update method
2016-02-24 12:01:50 +01:00
Laurent Destailleur
449d44419d
Fix: When module shipment is on, a contact of order is also contact of
...
shipment
2016-02-24 11:17:47 +01:00
Laurent Destailleur
09951888a5
Can select number of records for warehouse lists.
2016-02-23 23:04:17 +01:00
Laurent Destailleur
28b8258acb
Fix in most cases, we don't need translated value of languages, jsut
...
list of language code.
Fix cost price was not updated.
2016-02-23 19:50:33 +01:00
Sof
e6d06a67b4
FIX : Fatal error: Class 'FormVentilation' not found
2016-02-23 13:00:52 +01:00
Laurent Destailleur
ac6001cec8
Fix do not show warning if account defined
2016-02-23 12:44:46 +01:00
Ion Agorria
673f0c70a6
NEW: TimeZone can be supplied to mktime
2016-02-22 22:00:59 +01:00
Juanjo Menent
6db0f01fa4
FIX : Bad Argentina provences
2016-02-22 19:53:39 +01:00
Laurent Destailleur
843dada35d
Fix translation export/import
2016-02-22 17:42:41 +01:00
Laurent Destailleur
ff9a82c96f
Merge pull request #4670 from atm-ph/new_add_multicurrency_supplier_invoice_payment
...
New add multicurrency supplier invoice payment
2016-02-22 16:26:31 +01:00
Laurent Destailleur
f759f26db9
Fix travis error
2016-02-22 16:20:21 +01:00
Laurent Destailleur
ef497e2129
Merge pull request #4669 from peckpeck/translation_import
...
Add support to product translation imports
2016-02-22 16:17:19 +01:00
Laurent Destailleur
e34185783e
Merge pull request #4671 from GPCsolutions/develop-github
...
Added Github templates
2016-02-22 16:10:59 +01:00
Laurent Destailleur
77cbd885f2
NEW Add minimum stock and desired stock into import/export profiles.
...
NEW Add state into thirdparty export fields
2016-02-22 15:30:27 +01:00
Laurent Destailleur
81116da33b
Add a control of file format
2016-02-22 15:10:33 +01:00
Laurent Destailleur
cfdaa0e13c
Fix missing translation
...
Fix import of state
2016-02-22 14:49:30 +01:00
Laurent Destailleur
d128df1fe5
Fix js error .submit is not a function
2016-02-22 14:33:14 +01:00
Laurent Destailleur
dcdc53464d
Fix select2 text color
2016-02-22 14:25:12 +01:00
Laurent Destailleur
8e83f4f15c
Fix missing translation load
2016-02-22 13:52:01 +01:00
Laurent Destailleur
f6d1913bb7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2016-02-22 13:35:46 +01:00
Laurent Destailleur
a08fa814ec
Better filter to exclude mysqldump warning
2016-02-22 13:32:01 +01:00
Laurent Destailleur
762ab060e4
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-02-22 13:28:18 +01:00
Laurent Destailleur
355f091246
FIX Option MAIN_FORCE_STATE_INTO_ADDRESS and SOCIETE_DISABLE_STATE
2016-02-22 13:28:08 +01:00
Laurent Destailleur
2a6009096d
Add hidden option PRODUCT_DISABLE_LENGTH and PRODUCT_DISABLE_SURFACE
2016-02-22 13:11:46 +01:00
Laurent Destailleur
945eb9f094
NEW Add the event BILL_PAYED to list of supported events for module
...
notification.
2016-02-22 12:52:01 +01:00
Raphaël Doursenaud
d7304e516a
Added Github templates
2016-02-22 12:32:24 +01:00
Laurent Destailleur
6181ab4149
FIX Avoid to return an error due to mysql warning
2016-02-22 09:32:42 +01:00
Laurent Destailleur
e7e6957073
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-02-22 09:27:53 +01:00
Laurent Destailleur
a4f189eea7
Fix do not show warning if account defined
2016-02-22 09:27:18 +01:00
phf
fd4cda819c
New add supplier payment
2016-02-21 22:47:52 +01:00
Benoît Peccatte
c969b09ef7
Add support to product translation imports
2016-02-21 22:04:47 +01:00
Laurent Destailleur
93b1b4c66e
FIX #4580
2016-02-21 21:02:25 +01:00
Laurent Destailleur
54a4570b5f
FIX #4580
2016-02-21 20:57:15 +01:00
Laurent Destailleur
110c5b537a
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-02-21 20:04:18 +01:00
Laurent Destailleur
c1d7f5a7ed
FIX #4633
2016-02-21 20:00:40 +01:00
Laurent Destailleur
a118d58e5e
Merge pull request #4638 from GPCsolutions/dolibarr-clone
...
[Qual] Replaced deprecated dol_clone calls
2016-02-21 19:22:47 +01:00
Laurent Destailleur
0dc76fa1cd
Merge pull request #4626 from IonAgorria/hide-hourmins-2
...
Form changes to add duration info
2016-02-21 19:22:13 +01:00
Laurent Destailleur
77fcdc2e1d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-02-21 19:15:40 +01:00
Laurent Destailleur
3c2b50c6a2
Include PR
2016-02-21 19:14:18 +01:00
Laurent Destailleur
fb0e74645e
Merge pull request #4663 from peckpeck/xlsx_support
...
NEW Allow imports from xlsx files
2016-02-21 19:12:38 +01:00
Benoît Peccatte
5a8d1f1c95
Allow imports from xlsx files
2016-02-21 14:10:19 +01:00
phf
ec0282a28e
New add multicurrency display on supplier payment
2016-02-21 13:26:48 +01:00
Ion Agorria
9fc7041a28
Use error_parser instead of reserved error var
2016-02-20 19:47:17 +01:00
Ion Agorria
c84e74c081
Fix dynamic price parsing in fournisseurs.php
2016-02-20 19:37:11 +01:00
philippe grand
6f6f2a0574
enhance code help translation
2016-02-20 11:18:02 +01:00
Laurent Destailleur
351ce6228d
NEW Add width and height on product card
2016-02-20 04:49:02 +01:00
Laurent Destailleur
d3960b0809
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/lib/member.lib.php
htdocs/expedition/card.php
2016-02-20 04:25:39 +01:00
Laurent Destailleur
7def330f54
Fix missing error message and input lost in shipment create page
2016-02-20 03:58:52 +01:00
Laurent Destailleur
2e27319d1b
Fix Removed not expected br
2016-02-20 03:42:29 +01:00
Laurent Destailleur
a2817049c9
Fix must show warning only if threshold defined.
2016-02-20 03:34:56 +01:00
Laurent Destailleur
277d92af75
Secure migration for people using a RC
2016-02-20 03:14:29 +01:00
Laurent Destailleur
0ec6c20ebb
Translation
2016-02-20 02:55:32 +01:00
Laurent Destailleur
f15e06f623
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-02-20 02:45:43 +01:00
Laurent Destailleur
fcc26f36ba
Fix default first line to import is 1
2016-02-20 02:45:31 +01:00
Ion Agorria
fc8f1272d2
Fix line fetch not converting dates
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
2016-02-20 02:34:01 +01:00
Laurent Destailleur
7ff8c2c3db
FIX Missing carriage return when phone is into property ->phone
2016-02-20 02:31:42 +01:00
Laurent Destailleur
0a02d58afb
Merge pull request #4656 from defrance/patch-104
...
Add model_pdf fields for edition feature on product
2016-02-20 02:29:58 +01:00
Laurent Destailleur
12e6b52131
Merge pull request #4654 from aspangaro/3.9-p12
...
Fixed: Members - Problem of tab & missing language file
2016-02-20 02:28:48 +01:00
Laurent Destailleur
e0f7e3dece
Merge pull request #4659 from IonAgorria/fix-propal-fetch-date
...
Fix line fetch not converting dates
2016-02-20 02:26:30 +01:00
Laurent Destailleur
f762196c77
NEW Can define number of first and last line into import wizard.
2016-02-20 02:21:24 +01:00
Laurent Destailleur
266fb14a2c
FIX Missing carriage return when phone is into property ->phone
2016-02-20 02:19:18 +01:00
phf
d320aebe82
Fix muticurrency attributs not declared in class PropalLine
...
Fix fetch_lines of FactureFournisseur with multicurrency fields
2016-02-19 22:41:47 +01:00
phf
b7d99271f8
New add multicurrency on supplier order
2016-02-19 22:25:59 +01:00
Laurent Destailleur
7765e37101
Better support of option SOCIETE_SORT_ON_TYPEENT
2016-02-19 21:09:36 +01:00
Laurent Destailleur
4754ba5683
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/install/mysql/data/llx_10_c_regions.sql
htdocs/install/mysql/data/llx_20_c_departements.sql
htdocs/install/mysql/data/llx_c_forme_juridique.sql
htdocs/langs/de_DE/companies.lang
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/companies.lang
htdocs/langs/fr_FR/compta.lang
2016-02-19 20:17:51 +01:00
Ion Agorria
6002897976
Fix line fetch not converting dates
2016-02-19 20:06:09 +01:00
Laurent Destailleur
82f57b2ccf
Better position for modules
2016-02-19 20:05:25 +01:00
Laurent Destailleur
0faebc25ba
Update translations
2016-02-19 19:33:31 +01:00
Laurent Destailleur
da284cda8c
Add category Supplier Relationship Manager
2016-02-19 19:20:21 +01:00
Laurent Destailleur
00657d3bbe
Fix sql forging error
2016-02-19 19:11:54 +01:00
Laurent Destailleur
dbb8460180
Fix avoid false warning
2016-02-19 19:11:31 +01:00
Laurent Destailleur
f8956f785d
Fix syntax error
2016-02-19 16:12:39 +01:00
Laurent Destailleur
6ab8ba1cb1
Fix sql error
2016-02-19 16:10:14 +01:00
BENKE Charlie
d96c89afa1
Update 3.9.0-4.0.0.sql
2016-02-19 15:55:59 +01:00
BENKE Charlie
8f866254ac
add model_pdf fields for edition feature
2016-02-19 15:47:37 +01:00
Laurent Destailleur
994715f8bb
Upgrade romania
2016-02-19 15:47:00 +01:00
Laurent Destailleur
e820f09912
Start to introduce native responsive design
2016-02-19 15:28:43 +01:00
Laurent Destailleur
1cd0efd8db
Fix picto
2016-02-19 14:18:50 +01:00
BENKE Charlie
8349446340
No segment defined is not an error
...
This is a proposition of correction on all ODT file
If we don't define table of segment on odt we have an error
But in some case we don't want an table on ODT
2016-02-19 10:59:50 +01:00
aspangaro
d77a8bddcf
Fixed: Members - Problem of tab & missing language file
2016-02-19 07:39:14 +01:00
Laurent Destailleur
9c8d69eaa9
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
2016-02-19 04:46:11 +01:00
Laurent Destailleur
cc524c8180
Fix bad picto
2016-02-19 04:41:29 +01:00
Laurent Destailleur
79bc7cf085
Fix showing description
2016-02-19 04:05:08 +01:00
Laurent Destailleur
3864bd35c9
Fix NPR Vat is working correctly with multiprice too
2016-02-19 03:59:43 +01:00
Laurent Destailleur
b70f2f329c
Fix bad position of form
2016-02-19 03:59:22 +01:00
Laurent Destailleur
761ad0114c
Merge pull request #4641 from atm-ph/new_add_multicurrency_supplier_proposal_order
...
New add multicurrency on supplier proposal/order
2016-02-19 03:36:23 +01:00
Laurent Destailleur
9e11fd988d
Fix: color of category when showing full path must use color of last
...
element of path
2016-02-19 03:32:02 +01:00
Laurent Destailleur
03c3eb88d0
Merge pull request #4640 from atm-ph/fix_multicurrency_require
...
Fix replace dol_include_once() function by require_once for internal module
2016-02-19 02:50:05 +01:00
Laurent Destailleur
16c44af690
Fix bad example of setup to use
2016-02-19 02:44:56 +01:00
Laurent Destailleur
4d0b9946f5
FIX Maxi serious problem when updating prices and vat of a product. All
...
mode (one price, price per level, ...) were impacted. Localtax setup
were lost.
2016-02-19 02:41:00 +01:00
Laurent Destailleur
3b5ce32cb0
Code comment
2016-02-19 01:47:00 +01:00
Laurent Destailleur
bd80249580
Fix code comment
2016-02-19 01:45:52 +01:00
Laurent Destailleur
52c82508e4
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/compta/charges/index.php
2016-02-18 23:27:57 +01:00
Laurent Destailleur
b0b2668428
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-02-18 23:21:22 +01:00
Laurent Destailleur
bc4c964b89
Several fixes in stock management (label, and bad action when lot module
...
is on)
2016-02-18 23:21:02 +01:00
BENKE Charlie
9fd22722ff
left a space between clone and $object
2016-02-18 15:18:47 +01:00
Raphaël Doursenaud
dfe7c6f06f
Fix #4649 Wrong parameters order
2016-02-18 12:21:11 +01:00
BENKE Charlie
d889a1d91f
Change title page 'projects' to "project Area"
2016-02-18 11:56:32 +01:00
BENKE Charlie
7939169ae8
Change projets title Area
2016-02-18 11:54:48 +01:00
Laurent Destailleur
1a12eb33d6
Merge pull request #4639 from grandoc/3.9
...
[quality] : better help
2016-02-18 00:31:38 +01:00
Laurent Destailleur
7ba6754a55
Fix the missing button to record reception
2016-02-18 00:27:35 +01:00
Laurent Destailleur
5d2c189e0e
Fix bad place of table
2016-02-17 23:45:25 +01:00
Laurent Destailleur
633de3bcb4
Fix list of object referers should not be set to invoice by default (may
...
be module is disabed). I replace with a message to choose list.
2016-02-17 22:33:02 +01:00
Florian HENRY
d44c04877a
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2016-02-17 12:54:47 +01:00
phf
e24a35b904
New add multicurrency on supplier proposal/order
2016-02-16 23:58:21 +01:00
Laurent Destailleur
5268038e00
Minor css enhancement
2016-02-16 22:58:24 +01:00
Laurent Destailleur
1c6bef5a4c
NEW Use ellipsis truncation on too large left menu text
2016-02-16 22:45:14 +01:00
Laurent Destailleur
6b9d7763fe
Clean code for adding a link to a related object
2016-02-16 22:26:23 +01:00
phf
6d095fce9f
Fix replace dol_include_once() function by require_once for internal module
2016-02-16 20:44:23 +01:00
Laurent Destailleur
9796b1b268
Can select number of records into lists
2016-02-16 17:43:05 +01:00
philippe grand
03b9b65d93
[quality] : better help
2016-02-16 16:45:19 +01:00
Raphaël Doursenaud
5bb153877a
[Qual] Replaced deprecated dol_clone calls
...
With proper clone calls.
2016-02-16 16:05:30 +01:00
Laurent Destailleur
14fb2c914a
Fix option MAIN_USE_HOURMIN_IN_DATE_RANGE was not supported in output
2016-02-16 15:41:55 +01:00
Laurent Destailleur
5fb8068374
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-02-16 15:39:21 +01:00
Laurent Destailleur
060b59ac6c
Fix option MAIN_USE_HOURMIN_IN_DATE_RANGE was not supported in output
2016-02-16 15:38:24 +01:00
Laurent Destailleur
f809800e01
Fix sql error
2016-02-16 15:36:54 +01:00
Laurent Destailleur
e0a0817123
Merge pull request #4623 from IonAgorria/dynamic-price-changes
...
Dynamic price corretions/changes
2016-02-16 15:11:02 +01:00
Laurent Destailleur
9d418bca7f
Merge branch 'new_add_customer_multicurrency_payment' of
...
https://github.com/atm-ph/dolibarr into
atm-ph-new_add_customer_multicurrency_payment
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-16 15:06:39 +01:00
Laurent Destailleur
d8e173af03
Fix regression (class not found, css on hover broken) with try to manage
...
contrast on categories.
2016-02-16 15:01:28 +01:00
Laurent Destailleur
8fb0f8d9d1
Merge branch 'patch-100' of https://github.com/defrance/dolibarr into
...
defrance-patch-100
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/user/card.php
2016-02-16 13:54:56 +01:00
jfefe
841145678d
Always check links color when background color is set onto category
2016-02-16 12:56:57 +01:00
Laurent Destailleur
fad09357f4
NEW Show total number of modules into the module list
2016-02-16 12:54:42 +01:00
Laurent Destailleur
36b0cb5b23
NEW Merge all admin tools (system and module admin tools) into same
...
entry "Admin tools", so now things are clear: All features restricted to
an admin user is inside "setup" (for setup) or "admin tools" (for action
tools) instead of 3 different entries.
2016-02-16 12:50:15 +01:00
jfefe
134c9d13bc
FIX : check contrast of link when using background color for category
2016-02-16 12:45:18 +01:00
Regis Houssin
d55ac472c3
Fix: issue when bank module is disabled
...
Fix: missing entity filter for lines of payment
2016-02-16 11:27:58 +01:00
Florian HENRY
49a33cb8f9
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2016-02-16 10:30:17 +01:00
Laurent Destailleur
a4628e4bd1
Clean deprecated files
2016-02-16 00:41:30 +01:00
Laurent Destailleur
c78997ed23
Tons of fixes and enhancement on recurring invoice generation
2016-02-16 00:31:05 +01:00
phf
86c8998742
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_add_customer_multicurrency_payment
...
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-15 20:53:06 +01:00
Laurent Destailleur
9cbbf07351
Add fields to link recurring invoice lines with contract origin when it
...
comes from this.
2016-02-15 16:13:33 +01:00
Laurent Destailleur
d715345c82
Debug
2016-02-15 15:07:57 +01:00
Laurent Destailleur
38f7ac29d7
Show vat of lines on template invoices
2016-02-15 14:49:06 +01:00
Laurent Destailleur
23afb80c82
Can remove status recurring or not of template invoice
2016-02-15 14:42:05 +01:00
Laurent Destailleur
f1f5c48337
Uniformize code
2016-02-15 14:27:35 +01:00
Laurent Destailleur
816195cb43
Merge pull request #4600 from aspangaro/3.9-p11
...
Modifiy menu for accountancy module - New balance feature
2016-02-15 13:55:51 +01:00
BENKE Charlie
30a6b546b1
containing function prefer use text values instead numeric
2016-02-15 09:23:36 +01:00
BENKE Charlie
79b79e2acc
Update card.php
2016-02-15 09:21:21 +01:00
Laurent Destailleur
d4c3258385
Fix missing field
...
Fix bad value for default value of next date
2016-02-15 07:36:45 +01:00
Laurent Destailleur
353fa7c2fc
Little cleaning on how options ar shown
2016-02-15 07:12:23 +01:00
Laurent Destailleur
a138c1503a
Little cleaning on how options ar shown
2016-02-15 07:04:07 +01:00
aspangaro
d4057c3feb
Fixed: Correct problem of rights beetween tax and salaries module
2016-02-15 06:56:51 +01:00
aspangaro
a8ead1d44c
Merge remote-tracking branch 'Upstream/3.9' into 3.9-p11
...
Correct conflicts:
htdocs/core/menus/standard/eldy.lib.php
2016-02-15 06:31:34 +01:00
Laurent Destailleur
d0b657f6e7
Fix filter on products with spcific prices on thirdrty tab "customer
...
prices"
2016-02-15 02:15:29 +01:00
Laurent Destailleur
7aaae143fc
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/expedition/card.php
2016-02-15 02:01:58 +01:00
Laurent Destailleur
3bcc7b0f8f
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/comm/remise.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/filefunc.inc.php
htdocs/societe/price.php
2016-02-15 01:37:23 +01:00
Laurent Destailleur
1cf2b1b3af
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-02-15 01:19:57 +01:00
Laurent Destailleur
c85b7932a9
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/core/class/commonobject.class.php
2016-02-15 01:18:59 +01:00
Laurent Destailleur
051b412c17
Remove security fix
2016-02-15 01:16:01 +01:00
Laurent Destailleur
fdea892e3b
Merge pull request #4220 from bafbes/patch-11
...
NEW Can change customer on orders when hidden option COMMANDE_CHANGE_THIRDPARTY is on
2016-02-15 01:14:08 +01:00
Laurent Destailleur
e1d713738f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-02-15 01:03:09 +01:00
Laurent Destailleur
632080855b
Merge pull request #4622 from frederic34/patch-10
...
NEW Show link of bank receipt into bank transation list
2016-02-15 01:02:31 +01:00
Laurent Destailleur
6d4d54a917
Merge pull request #4618 from aspangaro/develop-p6
...
Updated: User accountancy code depends on Accounting module, not Salaries module
2016-02-15 00:59:52 +01:00
Laurent Destailleur
c1c8ead49f
Debug multicurrency module
2016-02-15 00:58:51 +01:00
Laurent Destailleur
4d4a35c93f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-02-15 00:46:20 +01:00
Laurent Destailleur
e8bc88fffe
Merge branch 'new_recurring_invoice' of
...
https://github.com/atm-ph/dolibarr into atm-ph-new_recurring_invoice
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-15 00:45:39 +01:00
Laurent Destailleur
f1c9a6fe48
Merge pull request #4594 from grandoc/3.9
...
default sort should be from A to Z
2016-02-15 00:39:00 +01:00
Laurent Destailleur
1e0d1d0ca1
Merge pull request #4592 from FHenry/develop
...
Accountancy feature
2016-02-15 00:38:15 +01:00
Laurent Destailleur
0c4d44a86c
Merge pull request #4591 from FHenry/3.9
...
Accoutancy
2016-02-15 00:35:24 +01:00
Laurent Destailleur
0d5f30f627
Merge pull request #4589 from frederic34/patch-8
...
Update google_oauthcallback.php
2016-02-15 00:34:22 +01:00
Laurent Destailleur
1cb6c7f3e9
Merge pull request #4603 from GPCsolutions/3.9-4597
...
FIX #4597 PHP 7 Uniform Variable Syntax
2016-02-15 00:32:11 +01:00
Laurent Destailleur
71a12824c9
Merge branch 'new_numbering_module_supplier_payment' of
...
https://github.com/atm-ph/dolibarr into
atm-ph-new_numbering_module_supplier_payment
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-15 00:31:33 +01:00
abb
7ecb263a04
Merge branch 'develop' of https://github.com/bafbes/dolibarr into dev
2016-02-15 00:20:19 +01:00
Laurent Destailleur
a9aab7545e
Merge pull request #4575 from altatof/fix_ttc_display
...
FIX: add missing global def for ttc column
2016-02-15 00:14:34 +01:00
abb
3e6eca546a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev
...
Conflicts:
htdocs/fichinter/card.php
htdocs/langs/en_US/products.lang
2016-02-15 00:06:51 +01:00
Laurent Destailleur
51ededc794
Fix duplicate template crabe and crevette. crevette was not updated and
...
contains old code compared to crabe. To manage situation invoice with a
PDF, code must be included into crabe (with some test if invoice is a
situation invoice or not to manage if to have different code)
2016-02-15 00:02:07 +01:00
Laurent Destailleur
3925ae0742
Fix: we loose ability to refresh contact list when changing a company on
...
contact tab
2016-02-14 23:54:07 +01:00
Frédéric FRANCE
5841055d9a
Update releve.php
2016-02-14 22:53:00 +01:00
Ion Agorria
a72c49f57b
Form changes to add duration info
2016-02-14 22:33:44 +01:00
Laurent Destailleur
2fd01d71cf
Fix #4548 Check on stock enough must be done according to warehouse
2016-02-14 22:20:42 +01:00
Laurent Destailleur
04b390f21c
Merge pull request #4507 from altatof/PROPAL_CLONE_ON_CREATE_PAGE
...
FIX ISSUE #4506 : make working the PROPAL_CLONE_ON_CREATE_PAGE hidden constant
2016-02-14 21:59:04 +01:00
Laurent Destailleur
13c85516ee
Doc comment
2016-02-14 21:58:54 +01:00
Laurent Destailleur
4bb980830f
Merge pull request #4571 from defrance/patch-99
...
Add Good Customers Boxes
2016-02-14 20:56:22 +01:00
abb
834f0b20ae
fix:no transaction in this place
2016-02-14 20:55:09 +01:00
abb
2f99273734
fix:no transaction in this place
2016-02-14 20:51:36 +01:00
Laurent Destailleur
666a3d907d
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-02-14 20:48:39 +01:00
Laurent Destailleur
b7ae5bac6f
Fix: The text "All" is not appropriate.
2016-02-14 20:48:25 +01:00
Laurent Destailleur
cc174daa13
Prepare 3.8.4
2016-02-14 20:12:47 +01:00
Ion Agorria
0e2be880c5
Convert null to string
2016-02-14 19:05:43 +01:00
Ion Agorria
89657d0439
Changed Price Parser functions and added testExpression
2016-02-14 17:28:31 +01:00
Ion Agorria
6bfc3f446f
Use setSupplierPriceExpression instead of product setPriceExpression
2016-02-14 16:35:23 +01:00
Ion Agorria
b1568a7319
Better Add buttons in dynamicprice module
2016-02-14 16:35:17 +01:00
Ion Agorria
99efbd3464
Check if dynamic price is enabled
2016-02-14 16:09:47 +01:00
Laurent Destailleur
b091d4e897
Merge pull request #4586 from hregis/3.8_bug
...
Fix: missing signature and uniformize code between card and script
2016-02-14 15:50:36 +01:00
Laurent Destailleur
e28c3a3ee7
Merge pull request #4585 from grandoc/3.8
...
fix : Strict Standards: Only variables should be passed by reference
2016-02-14 12:53:09 +01:00
Laurent Destailleur
d6227fd981
Merge pull request #4611 from bafbes/abb-0
...
urgent fix : start of transaction without finish
2016-02-14 12:51:30 +01:00
Laurent Destailleur
a8c305f820
Merge pull request #4617 from aspangaro/develop-p5
...
New: Weather icons depends of the theme
2016-02-14 12:50:12 +01:00
Laurent Destailleur
0e7739fa85
Merge pull request #4604 from IonAgorria/fix_productsupplierprice
...
Fix missing vars in fetch_product_fournisseur_price
2016-02-14 12:47:02 +01:00
Laurent Destailleur
b93e25a00d
Merge pull request #4601 from grandoc/develop
...
Add MAIN_VIEW_LINE_NUMBER for members list
2016-02-14 12:34:18 +01:00
Laurent Destailleur
9f75ac499f
Merge pull request #4606 from frederic34/patch-9
...
Update 3.8.0-3.9.0.sql
2016-02-14 12:25:54 +01:00
Laurent Destailleur
d973596601
Merge pull request #4587 from frederic34/patch-7
...
Update modOauth.class.php
2016-02-14 12:21:03 +01:00
Laurent Destailleur
030bec5ad7
Merge pull request #4619 from aspangaro/develop-p7
...
Correct travis
2016-02-14 12:19:35 +01:00
Frédéric FRANCE
e7a7909b9d
Update rappro.php
2016-02-14 12:16:17 +01:00
Ion Agorria
1f99ce8ae9
Fix var typo
2016-02-14 01:21:56 +01:00
BENKE Charlie
9f4909d8b1
Update categorie.class.php
2016-02-13 17:27:53 +01:00
BENKE Charlie
23cb0d437c
Update 3.9.0-4.0.0.sql
2016-02-13 10:53:01 +01:00
Laurent Destailleur
006c546a87
Fix select number of records in list
2016-02-13 10:51:42 +01:00
BENKE Charlie
b21b5e7bb8
Create llx_categorie_user.key.sql
2016-02-13 10:51:24 +01:00
BENKE Charlie
e3444e08a7
Create llx_categorie_user.sql
2016-02-13 10:50:46 +01:00
BENKE Charlie
5e288db0e5
add categorie user based on contact user
...
allow to add categorie to user, the same as contact user (because user and contact are persons too)
2016-02-13 10:42:45 +01:00
BENKE Charlie
c910fd151f
add setcategorie on user class
2016-02-13 10:27:12 +01:00
BENKE Charlie
a95a810d68
add categorie user based on contact user
2016-02-13 10:25:37 +01:00
aspangaro
45cc841b92
Correct travis
2016-02-13 08:10:13 +01:00
aspangaro
9c20bf1b2e
Updated: User accountancy code depends on Accounting module, not Salaries module
2016-02-13 08:03:49 +01:00
aspangaro
47f60e1f8d
Add function img_weather
2016-02-13 07:53:50 +01:00
aspangaro
5e608c9ab4
Move files from common directory to each template
2016-02-13 06:58:46 +01:00
Laurent Destailleur
298be09ee2
Uniformize behaviour by adding the back to list on thirdparty card
2016-02-13 03:38:56 +01:00
Laurent Destailleur
cd3a531449
Debug multicurrency
2016-02-13 03:33:41 +01:00
Laurent Destailleur
ecc338b1eb
Clean module
2016-02-13 03:25:20 +01:00
Laurent Destailleur
04114a5e1e
Provide a better explanation on how the module dynamic price works
2016-02-13 03:11:27 +01:00
abb
4dce09cd27
include expense reports in linked objects section and provide template for them in this section
...
Conflicts:
htdocs/core/class/html.form.class.php
2016-02-13 00:37:38 +01:00
abb
0063635c67
fix:no transaction in this place
2016-02-13 00:00:20 +01:00
phf
4f6289bea0
Fix test if frequency is defined to create or not by the cron
2016-02-12 16:09:50 +01:00
phf
1143612bc0
Fix add key in traduction lang
2016-02-12 16:03:01 +01:00
phf
428a7e7042
FIX remove comment, calcul next date for recurring invoice, increment nb_gen_done
2016-02-12 15:55:55 +01:00
Laurent Destailleur
94732b8ae9
NEW When emailing is not sent completely, show progression
2016-02-12 14:23:40 +01:00
Laurent Destailleur
d0ab1db19b
NEW When emailing is not sent completely, show progression
2016-02-12 14:21:44 +01:00
Laurent Destailleur
2796875ed1
Can select size of list of targets of email
2016-02-12 13:58:24 +01:00
phf
c4812abd62
Fix can update fields of facture rec
...
Fix create invoice from facture rec don't get all properties and add fk_account
2016-02-12 12:31:43 +01:00
Laurent Destailleur
969314e731
Fix: disabling option lead in not working dolibarr
2016-02-12 12:19:32 +01:00
Laurent Destailleur
1c6d154a77
Fix: disabling option lead in not working dolibarr
2016-02-12 12:19:11 +01:00
gauthier
756b50b9d3
FIX : search product in customer product prices doesn't work
2016-02-12 12:06:23 +01:00
Frédéric FRANCE
ad534c90e6
Update 3.8.0-3.9.0.sql
2016-02-12 10:34:21 +01:00
Laurent Destailleur
158906455a
NEW Can change dynamically number of records visible into lists.
2016-02-11 20:40:33 +01:00
Ion Agorria
1a45ab9d50
Fix missing vars in fetch_product_fournisseur_price
2016-02-11 20:29:45 +01:00
Laurent Destailleur
bc33b19d7d
NEW Can change dynamically number of records visible into lists.
2016-02-11 20:24:15 +01:00
Raphaël Doursenaud
d038ca1875
FIX #4597 PHP 7 Uniform Variable Syntax
...
PHP7 compatibility with the new Uniform Variable Syntax.
This change is compatible with both PHP 5 and PHP 7.
See: https://wiki.php.net/rfc/uniform_variable_syntax#backward_incompatible_changes
2016-02-11 20:01:51 +01:00
Laurent Destailleur
e67be201ed
NEW Can select number of lines on page list for projects and tasks
2016-02-11 16:49:13 +01:00
Laurent Destailleur
51cc252d4a
Fix: submit was no more possible from keyboard
2016-02-11 15:47:47 +01:00
Laurent Destailleur
518080468e
Fix button create template must be visible only if amount is != 0
2016-02-11 10:39:01 +01:00
phf
875e01aeee
New add recurrence fields on create form of invoice model
...
Fix missing fields in database about multicurrency
2016-02-11 09:50:35 +01:00
philippe grand
a430b59bac
Add MAIN_VIEW_LINE_NUMBER for members list
2016-02-11 09:41:45 +01:00
aspangaro
f1a26cf54b
Correct problem of merging for language file
2016-02-11 06:49:49 +01:00
aspangaro
87fee74fb1
Modify menu for accountancy module - New balance feature
2016-02-11 06:48:23 +01:00
aspangaro
b47252fcb6
Modifiy menu for accountancy module - New balance feature
2016-02-11 06:39:02 +01:00
Laurent Destailleur
0d7f67ade5
Merge remote-tracking branch 'origin/3.9' into develop
2016-02-10 23:59:15 +01:00
Laurent Destailleur
e169cd3364
Fix usage of filter into selection of email members into emailing.
2016-02-10 23:48:18 +01:00
Laurent Destailleur
6662c1b5e1
NEW Can select dynamicaly number of lines to show on page on product,
...
shipment, contact, orders, thirdparties
Fix can make a shipment for product not predefined in multiwarehouse
mode
2016-02-10 23:37:34 +01:00
phf
a0cfe9aad8
New add payment with multicurrency module
2016-02-10 23:16:38 +01:00
Laurent Destailleur
9b41e11a1e
NEW Can select dynamicaly number of lines to show on page
2016-02-10 20:48:18 +01:00
Laurent Destailleur
ab2ac26f17
NEW When a field to show into list is selected, the form is
...
automatically submited
2016-02-10 19:27:22 +01:00
Laurent Destailleur
6dbaba6973
Fix: previous and next arrow
2016-02-10 17:45:26 +01:00
Florian HENRY
23e35a6012
update size of elementtype column into llx_actioncomm (module_subelement
...
name can be longer than 32)
2016-02-10 14:21:57 +01:00
philippe grand
39feb45779
default sort should be from A to Z
2016-02-10 12:15:22 +01:00
philippe grand
d02f8393dc
Merge branch '3.8' of https://github.com/Dolibarr/dolibarr.git into 3.8
2016-02-10 11:43:33 +01:00
Florian HENRY
1306a606a8
NEW : Margins module - Check/update buying price on invoice lines
2016-02-09 20:01:43 +01:00
Florian HENRY
ef7e245432
g
2016-02-09 19:23:17 +01:00
Florian HENRY
4401995540
Accountancy feature
2016-02-09 19:22:52 +01:00
Florian HENRY
44e39519b0
add accountancy balance
2016-02-09 19:20:03 +01:00
Florian HENRY
05d7b14786
Accoutancy
2016-02-09 19:11:19 +01:00
Florian HENRY
61dc17f280
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-02-09 19:07:04 +01:00
Laurent Destailleur
7ef0415aca
Small per enhancement
2016-02-09 15:57:24 +01:00
Laurent Destailleur
5c1c413c02
Fix warning
2016-02-09 15:44:34 +01:00
Laurent Destailleur
5ea9c6dd83
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/core/class/html.formprojet.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/accountancy.lang
2016-02-09 14:40:25 +01:00
Laurent Destailleur
223195538a
Return bad late or not status for order
2016-02-09 14:29:12 +01:00
Frédéric FRANCE
c28f977e02
Update printgcp.modules.php
2016-02-09 14:12:34 +01:00
Frédéric FRANCE
ffccd43aab
Update oauth.php
2016-02-09 14:08:50 +01:00
Frédéric FRANCE
51da5ea1f0
Update printgcp.modules.php
2016-02-09 14:07:54 +01:00
Frédéric FRANCE
73041b0be5
Update google_oauthcallback.php
2016-02-09 14:05:05 +01:00
Laurent Destailleur
f640bf7c61
Manage the reply-to field into mail libs
2016-02-09 11:56:12 +01:00
Laurent Destailleur
805940f61c
Merge pull request #4539 from bafbes/patch-22
...
Set mail reply-to field to sender in smtps class
2016-02-09 10:17:33 +01:00
Laurent Destailleur
d89daf9cd2
Work to move the merge pdf tool into the mass action combo of lists
2016-02-08 18:04:42 +01:00
Frédéric FRANCE
5dd016c3bc
Update modOauth.class.php
2016-02-08 17:55:29 +01:00
Laurent Destailleur
50eae967bc
Fix disabled entries were no greyed
2016-02-08 17:48:14 +01:00
Laurent Destailleur
bfcf1e01e8
Fix alignement
2016-02-08 16:51:29 +01:00
Laurent Destailleur
7445a0f71c
Clean code for generating sheet of barcode. Can choose output filename.
2016-02-08 16:42:34 +01:00
Laurent Destailleur
404663472a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-02-08 15:50:34 +01:00
Laurent Destailleur
0b6bd0bc14
More robust error management on barcode module.
2016-02-08 15:49:38 +01:00
BENKE Charlie
c672ad9fed
Update box_goodcustomers.php
2016-02-08 15:00:49 +01:00
Laurent Destailleur
fcf1e20d5b
Merge pull request #4578 from frederic34/sticker
...
Dictionnary for label sticker and card format
2016-02-08 14:49:31 +01:00
Sof
19b333f78b
FIX : Typo
2016-02-08 14:48:05 +01:00
Laurent Destailleur
b5ca02fddf
Merge pull request #4576 from mrsof/patch-5
...
TYPO : Syntax error in golbal var
2016-02-08 14:46:57 +01:00
Laurent Destailleur
d2708a4225
Merge pull request #4475 from atm-ph/new_multicurrency_module
...
New multicurrency module
2016-02-08 14:44:49 +01:00
Regis Houssin
0b25601307
Fix: wrong object name
2016-02-08 12:31:40 +01:00
Regis Houssin
9b10f030bf
Fix: missing signature and uniformize code between card and script
2016-02-08 12:20:40 +01:00
Florian HENRY
2991084061
fx accountancy
2016-02-08 10:50:40 +01:00
philippe grand
a15d03a676
fix : Strict Standards: Only variables should be passed by reference
2016-02-08 10:06:32 +01:00
Laurent Destailleur
c4c7ea2f22
FIX Relative discount decimals are not saved
2016-02-08 02:49:19 +01:00
Laurent Destailleur
e28765ff69
Fix: List of employee is by default selected on employee = yes
2016-02-07 23:07:16 +01:00
Laurent Destailleur
99c59c8c6b
Missing translation
2016-02-07 23:01:21 +01:00
Laurent Destailleur
cfa3b16637
Menu entries for accountancy are shown when menu entry is selected and
...
not all the time
2016-02-07 22:47:46 +01:00
Laurent Destailleur
ad63d5c48d
NEW Move load module to status experimental
2016-02-07 22:47:16 +01:00
Laurent Destailleur
81aae30253
NEW Add a checkbox to select/unselect all lines on page that support
...
mass actions (like invoice list page)
2016-02-07 19:55:41 +01:00
Laurent Destailleur
786f16de02
Add comment
2016-02-07 16:20:07 +01:00
Laurent Destailleur
baa6172ead
Fix look for first incoterm combo
2016-02-07 16:13:33 +01:00
Laurent Destailleur
b68047428a
Fix filter on cron
2016-02-07 16:02:30 +01:00
Laurent Destailleur
9da0164d90
Uniformize code for lists
2016-02-07 15:50:48 +01:00
Laurent Destailleur
3a5846ea7f
Fix bad link to bank account
2016-02-07 14:45:49 +01:00
Laurent Destailleur
efc2eeea83
Uniformize code for filters on payments
2016-02-07 14:41:06 +01:00
Laurent Destailleur
c1a6a2880b
Debug numbering module for customer payment
2016-02-07 14:22:52 +01:00
Laurent Destailleur
28c89dc3e3
Prepare the ground to have a full editable homearea page
2016-02-07 13:10:36 +01:00
Laurent Destailleur
c71bb9d67c
Fix filter on contract not visible
2016-02-07 12:33:40 +01:00
aspangaro
eaca582cb5
Fixed: Problem of merging - Review page init accountancy again
2016-02-07 08:47:02 +01:00
aspangaro
9d427d2248
Fixed: Missing link in eldy menu to init accountancy
2016-02-07 07:41:53 +01:00
Laurent Destailleur
84f4f2d40f
FIX The search on user/group was not using new code. Fiels used for
...
search was not visible.
2016-02-07 02:55:56 +01:00
Laurent Destailleur
8a8aaf618d
Fix: select to add box was lost
2016-02-07 02:22:10 +01:00
Laurent Destailleur
4c859999e8
Fix first install on debian.
2016-02-06 17:19:57 +01:00
Laurent Destailleur
c6fe8e5479
Fix first install on debian.
2016-02-06 17:13:24 +01:00
Laurent Destailleur
ebd9a97bab
Prepare 3.9
2016-02-06 15:55:05 +01:00
Laurent Destailleur
58f728eae5
Prepare 3.9rc
2016-02-06 15:11:45 +01:00
Laurent Destailleur
806d3642d8
FIX Bad filter on opportunities
...
Conflicts:
htdocs/core/class/html.formprojet.class.php
2016-02-06 15:09:57 +01:00
Laurent Destailleur
3828fe7026
FIX Bad filter on opportunities
2016-02-06 15:06:37 +01:00
phf
d66bc6f1b3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_numbering_module_supplier_payment
...
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2016-02-06 12:57:30 +01:00
Laurent Destailleur
8f8c63e9c8
FIX Delete triggers must be before delete (reverse order compared to
...
create)
2016-02-06 12:37:48 +01:00
Laurent Destailleur
2e1011ca0c
Add hidden option MAIN_CAN_HIDE_EXTRAFIELDS to disable a feature that
...
seems useless.
2016-02-06 12:29:02 +01:00
frederic34
e079021de3
data
2016-02-06 12:16:12 +01:00
frederic34
0d11d94234
Merge remote branch 'upstream/develop' into sticker
...
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-06 12:12:35 +01:00
frederic34
9c74af63af
Dictionnary for label sticker and card format
2016-02-06 12:06:05 +01:00
BENKE Charlie
59c9d85275
Update boxes.lang
2016-02-05 23:38:04 +01:00
BENKE Charlie
e2afe5460e
Update modSociete.class.php
2016-02-05 23:37:31 +01:00
BENKE Charlie
eb48e84b34
name of boxe file changed
2016-02-05 23:37:04 +01:00
Laurent Destailleur
fd7a05490d
DiscountOffered text was too long
2016-02-05 20:06:07 +01:00
Sof
0cee4b016b
FIX : Typo
2016-02-05 19:46:01 +01:00
Laurent Destailleur
96bf59f065
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2016-02-05 19:21:59 +01:00
Christophe Battarel
7a6c7f10a6
FIX: add missing global def for ttc column
2016-02-05 19:14:40 +01:00
Laurent Destailleur
36a29872b1
Merge pull request #4559 from fmarcet/3.8
...
FIX: Check stock of batch on shippment
2016-02-05 18:41:01 +01:00
Laurent Destailleur
7044e62afa
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2016-02-05 18:37:13 +01:00
Laurent Destailleur
bf7181a064
All messages separated with , into errorsToString
2016-02-05 18:37:01 +01:00
Laurent Destailleur
02c54f4ea6
Merge pull request #4573 from altatof/fix_ttc
...
FIX: retrieve correct pu_ttc (set by printObjectLine function) like in 3.7
2016-02-05 18:34:45 +01:00
Laurent Destailleur
cb66448148
Merge pull request #4564 from atm-ph/new_feature_hidden_extrafields
...
NEW feature hidden extrafields
2016-02-05 17:22:51 +01:00
Christophe Battarel
f0aef88589
better fix
2016-02-05 13:49:19 +01:00
Christophe Battarel
36c7697b63
FIX: retrieve correct pu_ttc (set by printObjectLine function) like in
...
3.7
2016-02-05 13:43:06 +01:00
fmarcet
ede4453164
Fix: Avoid errors when batch stock is negative
2016-02-05 12:59:32 +01:00
fmarcet
01f2180822
Merge remote-tracking branch 'origin/3.8' into 3.8
2016-02-05 12:57:43 +01:00
Laurent Destailleur
713050bd57
Fix style on payment page
2016-02-05 12:46:41 +01:00
Laurent Destailleur
e1da95871a
Fix bad name
2016-02-05 12:23:16 +01:00
Laurent Destailleur
062deae24c
Merge
2016-02-05 12:18:50 +01:00
Laurent Destailleur
e9ee816826
Merge pull request #4561 from fappels/3.8
...
Fix #4556 Desired minimum stock and Stock limit for alert cleared on modify product
2016-02-05 11:12:31 +01:00
Laurent Destailleur
c9c5484805
Merge pull request #4570 from frederic34/patch-8
...
Update CMailFile.class.php
2016-02-05 10:58:42 +01:00
Laurent Destailleur
04043cdb31
Merge pull request #4569 from abcnet-lu/raisons-socials-luxembourg
...
Fix: legal forms and professional IDs in Luxembourg
2016-02-05 10:58:03 +01:00
Laurent Destailleur
d66d3c0a8f
Merge pull request #4567 from defrance/patch-98
...
Add odt & pdf edition on product
2016-02-05 10:57:49 +01:00
Laurent Destailleur
0ae8a3398d
Fix sql error when extrafields on contact
2016-02-05 10:56:45 +01:00
Laurent Destailleur
876bc2537c
Merge pull request #4563 from atm-ph/fix_develop_list_socpeople
...
FIX list of contact
2016-02-05 10:55:01 +01:00
Laurent Destailleur
807e7b8304
Merge pull request #4560 from abcnet-lu/revert-develop-20160203
...
Fix : Add districts and cantons for Luxembourg
2016-02-05 10:53:51 +01:00
Laurent Destailleur
8e7b560cea
Merge pull request #4562 from atm-ph/fix_formpropal_infinite_loop
...
FIX infinite loop
2016-02-05 10:51:49 +01:00
Laurent Destailleur
f518ef58bb
Merge pull request #4557 from abcnet-lu/develop
...
Fix: Inverted labels of intermediary / reduced VAT rates for Luxembourg
2016-02-05 10:51:18 +01:00
Laurent Destailleur
5a2647906e
Merge pull request #4530 from defrance/patch-96
...
Add hook on contacttpl
2016-02-05 10:50:40 +01:00
phf
a8e480e392
FIX #3509 payment ref for suppliers
2016-02-04 23:15:06 +01:00
phf
32c0b2a9b1
NEW add html id/class to locate value in the DOM html
2016-02-04 21:05:19 +01:00
phf
7e3a787688
FIX phpcs
2016-02-04 19:03:25 +01:00
BENKE Charlie
9c896b1869
translations too
2016-02-04 18:10:28 +01:00
BENKE Charlie
5498b1cd5a
Update modSociete.class.php
2016-02-04 18:06:43 +01:00
BENKE Charlie
70e051a1bf
Add goods customers boxes
2016-02-04 18:05:35 +01:00
Laurent Destailleur
69e0f1ebc3
Add log to help debug
2016-02-04 17:55:30 +01:00
Frédéric FRANCE
a656607122
Update CMailFile.class.php
2016-02-04 17:12:58 +01:00
BENKE Charlie
87c5854382
just change for rerun travis cheking
2016-02-04 16:58:19 +01:00
abcnet-lu
1e9ea4f2ac
[ #4568 ] Add professional IDs for Luxembourg
2016-02-04 16:40:49 +01:00
