Frédéric FRANCE
fd9fb505b9
Update printgcp.modules.php
2016-04-21 07:53:22 +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
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
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
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
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
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
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
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
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
frederic34
60ebc6fa11
Some correction for testconnect
2016-04-18 00:47:08 +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
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
frederic34
567dc1734e
Add Swift Mailer to send mails
2016-04-16 18:15:03 +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
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
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
357877b1fe
Debug multicurrency and clean properties of some modules
2016-04-12 14:45:59 +02:00
Florian HENRY
872c99afe9
FIX Hook resprint be printed
2016-04-12 11:35:39 +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
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
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
b9de3d5852
FIX #4442 Missing translation in Banks menu
...
Close #4442
2016-04-09 23:03:00 +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
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
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
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
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
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
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
60682f075c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-08 21:46:17 +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
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
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
1b04eabf1f
Merge log with events tabs
2016-04-08 14:28:49 +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
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
Laurent Destailleur
086345490d
Generalize the set of trackid for everyemail sent by dolibarr.
2016-04-07 14:29:07 +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
a43a0a3f4c
Debug module loan and disable non working features
2016-04-06 11:21:55 +02:00
Alexis Algoud
a2c5bfa72c
FIX parse error
2016-04-06 10:20:38 +02:00
Alexis Algoud
11bb4d1cfb
Show in select
2016-04-06 10:17:13 +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
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
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
2d102d3132
Bad translation key
2016-04-05 10:24:28 +02:00
Laurent Destailleur
6c87dfafae
FIX Bad translation key
2016-04-05 10:12:03 +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
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
gauthier
e043aebfa1
NEW : project sharing in select_projetcs_list function
2016-04-04 11:05:12 +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
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
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
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
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
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
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
33e8833287
Fix travis
2016-04-03 10:47:21 +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
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
Florian HENRY
038b928ea4
fix travis
2016-04-01 17:09:03 +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
Florian HENRY
304aab957b
Start implement advance arget emalaing
2016-04-01 10:52:19 +02:00
aspangaro
84d326e036
FIX: Problem with dolibarr installation/migration script. Range is a reserved name.
2016-04-01 06:41:49 +02:00
Florian HENRY
f567a2a0ce
Search box hook
2016-03-31 12:50:40 +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
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
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
Andreas Pachler
7eded39e28
Reworked functionality to get project contact as contact_xx tags
2016-03-30 08:34:32 +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
Laurent Destailleur
ff96ebf381
Enahnce navigation
2016-03-29 22:09:13 +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
4d37c47990
NEW Can select language from combo list on page to overwrite a
...
translation
2016-03-29 18:05:03 +02:00
Laurent Destailleur
6188c3fced
NEW Introduce a predefined job to run database backup
2016-03-29 14:52:27 +02:00
Christophe Battarel
024f55d461
FIX: systematic rounding causes prices to be updated without reason
2016-03-29 12:02:36 +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
432cc44ab6
NEW: Accountancy - Add category
2016-03-28 13:51:19 +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
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
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
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
philippe grand
08970e67d7
fix a lot of beug
2016-03-25 18:16:58 +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
00bf8caa8c
FIX #4870
2016-03-25 17:55:58 +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
Laurent Destailleur
c8fd12cdaa
Update code comment
2016-03-25 17:14:20 +01:00
BENKE Charlie
bf2d52894a
correct travis too
2016-03-25 16:48:45 +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
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
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +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
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
922c57da76
NEW #3510 : Standardize module
2016-03-23 22:45:04 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
philippe grand
d434cee3fa
[Qual] Typo
2016-03-17 09:40:05 +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
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
abb
d35f728fad
added handle to trigger FICHINTER_ADD_CONTACT in notify module
2016-03-13 19:58:39 +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
1b30c1adb4
Fix regression on vat calculation when invoice was not a situation
...
invoice
2016-03-12 20:49:38 +01:00
Laurent Destailleur
7dac7c4f04
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-11 11:00:53 +01:00
Laurent Destailleur
a9058df753
Fix bad field in select
2016-03-11 10:47:17 +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
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
155fd71f6d
Merge pull request #4734 from fappels/develop
...
Fix: add require to showDimensionInBestUnit
2016-03-10 13:22:58 +01:00
Laurent Destailleur
a12d81cbda
Fix PHPCS
2016-03-10 12:36:25 +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
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
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
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
Florian HENRY
a8e2b49c5b
FIX : #4768
2016-03-08 10:22:31 +01:00
Benlo
0166d2ec3a
FR4763 add possibility to export contacts/thirdparty categories
2016-03-07 17:49:26 +01:00
Laurent Destailleur
896f60a478
hidden solution to solve files overwriting each other
2016-03-06 00:47:00 +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
Laurent Destailleur
d1777a6783
Replace function rand with mt_rand (prepare php 8)
2016-03-05 15:01:25 +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
Francis Appels
0890f20a72
Update functions.lib.php
...
Add product.lib for function measuring_units_string
2016-03-04 19:29:08 +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
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
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
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
e60088a297
Add parameter moreinheader
2016-03-04 13:30:00 +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
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
Frédéric FRANCE
902eba67d2
Update html.formfile.class.php
2016-03-03 17:12:16 +01:00
Ion Agorria
6feaaf906c
NEW: Configurable default hour and min in date start/end
2016-03-03 16:11: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
f3745511fd
Fix missing translation
2016-03-03 12:15:17 +01:00
Laurent Destailleur
fd2166ed11
Minor enhancement on new recurring invoice generation
2016-03-03 10:42:49 +01:00
Laurent Destailleur
b1c1de422f
Enhance look of cron job list
2016-03-03 10:05:40 +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
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
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
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
Frédéric FRANCE
a58dda76ed
Update product.lib.php
2016-03-01 17:28: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
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
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
2ee74a80d9
NEW Enhance navigation of project module
2016-02-28 00:01:50 +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
c86a1a30d5
Fix a lot of fixes to have the french vat npr working better
2016-02-27 11:46:16 +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
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
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
f330a1c8e5
Fix phpcs
2016-02-26 10:55:47 +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
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
7fc58ddabc
FIX Array of linked elements for PDF contains duplicates and missing
...
data
2016-02-25 18:18:00 +01:00
Laurent Destailleur
8c43276fda
FIX Extrafields of shipments was not included into export fields
2016-02-25 15:46:14 +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
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
1ba2407da4
Merge remote-tracking branch 'origin/3.9' into develop
2016-02-25 01:42:03 +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
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
2747259fbd
Fix: missing payment term and condition into update method
2016-02-24 12:01:50 +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
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
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
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
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
cfdaa0e13c
Fix missing translation
...
Fix import of state
2016-02-22 14:49:30 +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
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
945eb9f094
NEW Add the event BILL_PAYED to list of supported events for module
...
notification.
2016-02-22 12:52:01 +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
Benoît Peccatte
c969b09ef7
Add support to product translation imports
2016-02-21 22:04: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
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
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
277d92af75
Secure migration for people using a RC
2016-02-20 03:14:29 +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
266fb14a2c
FIX Missing carriage return when phone is into property ->phone
2016-02-20 02:19:18 +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
82f57b2ccf
Better position for modules
2016-02-19 20:05:25 +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
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
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
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
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
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
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
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
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
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
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
d715345c82
Debug
2016-02-15 15:07:57 +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
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
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
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
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
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
Ion Agorria
a72c49f57b
Form changes to add duration info
2016-02-14 22:33:44 +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
Ion Agorria
89657d0439
Changed Price Parser functions and added testExpression
2016-02-14 17:28:31 +01:00
Ion Agorria
99efbd3464
Check if dynamic price is enabled
2016-02-14 16:09:47 +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
d973596601
Merge pull request #4587 from frederic34/patch-7
...
Update modOauth.class.php
2016-02-14 12:21:03 +01:00
aspangaro
47f60e1f8d
Add function img_weather
2016-02-13 07:53:50 +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
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
Laurent Destailleur
969314e731
Fix: disabling option lead in not working dolibarr
2016-02-12 12:19:32 +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
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
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
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
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
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
Frédéric FRANCE
c28f977e02
Update printgcp.modules.php
2016-02-09 14:12:34 +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
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
Laurent Destailleur
d2708a4225
Merge pull request #4475 from atm-ph/new_multicurrency_module
...
New multicurrency module
2016-02-08 14:44:49 +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
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
9da0164d90
Uniformize code for lists
2016-02-07 15:50:48 +01:00
Laurent Destailleur
28c89dc3e3
Prepare the ground to have a full editable homearea page
2016-02-07 13:10:36 +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
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
2e1011ca0c
Add hidden option MAIN_CAN_HIDE_EXTRAFIELDS to disable a feature that
...
seems useless.
2016-02-06 12:29:02 +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
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
Christophe Battarel
7a6c7f10a6
FIX: add missing global def for ttc column
2016-02-05 19:14:40 +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
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
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
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
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
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
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
BENKE Charlie
f87bfffdd9
add edition feacture on product element
2016-02-04 16:12:00 +01:00
phf
0c05342934
FIX infinite loop
2016-02-03 22:54:48 +01:00
phf
75c4888364
NEW feature hidden extrafields
2016-02-03 22:49:43 +01:00
phf
1b552a0b3b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module
...
Conflicts:
htdocs/core/class/link.class.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-03 18:30:59 +01:00
Laurent Destailleur
47e2e33fb7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/admin/index.php
htdocs/accountancy/admin/productaccount.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/menus/init_menu_auguria.sql
2016-02-03 03:27:17 +01:00
Laurent Destailleur
19300a2d82
Fix warning when javascript disabled
2016-02-03 03:10:58 +01:00
Laurent Destailleur
229199aaad
FIX #4497
2016-02-03 01:32:50 +01:00
Laurent Destailleur
e22664b8cf
FIX #4528
2016-02-03 01:01:14 +01:00
Laurent Destailleur
547ffd7fcc
Add missing phpunit tests
2016-02-02 17:26:14 +01:00
Laurent Destailleur
d88cd500ce
Merge pull request #4547 from bafbes/dev1
...
fix:remove project info in standard document model for expense reports when project module is disabled
2016-02-02 16:41:12 +01:00
Laurent Destailleur
82cc0b409c
Merge pull request #4546 from bafbes/bra
...
provide link section in expense reports and add option for intervention
2016-02-02 16:17:25 +01:00
Laurent Destailleur
0def82f596
Merge pull request #4543 from aspangaro/develop-export
...
New: Add User accountancy code in user export
2016-02-02 15:32:56 +01:00
Laurent Destailleur
43ac8b72a3
Merge pull request #4542 from aspangaro/3.9-p9
...
New accountancy menu for auguria
2016-02-02 15:32:32 +01:00
PeartreeG
4c0f29d234
Update fichinter.lib.php
2016-02-02 14:05:58 +01:00
Florian HENRY
3c94f5d4d4
Add log into next values
2016-02-02 11:38:32 +01:00
PeartreeG
c1ff21c30a
add fichinter link to resources
2016-02-01 16:09:58 +01:00
Laurent Destailleur
64514b38da
Merge remote-tracking branch 'origin/3.9' into develop
2016-02-01 01:23:41 +01:00
Laurent Destailleur
f22373b70b
Fix bad management of option MAIN_HTML_TITLE
2016-02-01 01:19:37 +01:00
abb
3bcfe849a1
fix:remove project info in standard document model for expense reports when project module is disabled
2016-01-31 22:35:09 +01:00
abb
773ee5c0ea
provide link section in expenses and add option for intervention
2016-01-31 19:59:47 +01:00
Laurent Destailleur
475cc24e13
NEW Can edit next execution date of a cron job.
2016-01-31 15:37:23 +01:00
Laurent Destailleur
928336c835
NEW Clean and enhance code for cron engine
2016-01-31 15:14:50 +01:00
Laurent Destailleur
426e9297ea
Prepare code to match cron rule: 0 if ok, !=0 if error
2016-01-31 14:20:02 +01:00
PeartreeG
d1018760df
Update resource.lib.php
2016-01-31 12:24:19 +01:00
PeartreeG
4c025d4323
Adding additional tabs
2016-01-31 12:23:05 +01:00
abb
2f40233e01
fix : handle case of non existing third party field in object in fecth_thirdparty function
2016-01-31 10:35:56 +01:00
aspangaro
6a12cdc876
New: Add User accountancy code in export
2016-01-31 08:18:47 +01:00
aspangaro
2fa01a1754
Merge remote-tracking branch 'Upstream/3.9' into 3.9-p9
2016-01-31 07:33:57 +01:00
aspangaro
c77fda5128
New accountancy menu for auguria
2016-01-31 07:31:48 +01:00
BENKE Charlie
324c1123e0
Update contacts.tpl.php
...
if permission modules right are not in french
2016-01-30 17:21:42 +01:00
Bahfir Abbes
32b6f20754
Update smtps.class.php
...
Set mail reply-to field to sender
2016-01-30 17:13:58 +01:00
Laurent Destailleur
71edb3f061
Fix phpcs
2016-01-30 16:57:00 +01:00
Laurent Destailleur
e3a4124a58
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/card.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/langs/fr_FR/bills.lang
2016-01-30 16:13:06 +01:00
Laurent Destailleur
5e9fd25a6e
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-01-30 15:59:40 +01:00
mic9p
8faeac611a
Do not select siren but tva_intra from societe
...
VAT report by customer shows an empty field.
2016-01-30 15:35:28 +01:00
Laurent Destailleur
5212303208
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-01-30 15:29:52 +01:00
Laurent Destailleur
d21908755e
FIX Import/Export NPR VAT
2016-01-30 15:29:35 +01:00
Laurent Destailleur
c6a6889d79
Merge pull request #4389 from aspangaro/3.9-p6
...
Fix: Some problems presentation on accountancy module
2016-01-30 13:04:22 +01:00
mic9p
827fd39658
Do not select siren but tva_intra from societe
...
VAT report by customer shows an empty field.
2016-01-30 10:35:57 +01:00
BENKE Charlie
d79478e66d
Add hook on contacttpl
...
The goal is to display additionnal feature a the bottom of the contact page like display contact adress and print stamp directly
Another way is to show on a google maps the travel to do between us and the multiple thirdpartie present
2016-01-30 09:43:02 +01:00
Laurent Destailleur
19d119d3a4
Debug cron module.
...
Task to delete temporary files older than 24 is on by default.
2016-01-30 02:51:26 +01:00
Laurent Destailleur
1854f07e5c
Move code to purge files into a dedicated utils class (cron job need
...
class)
2016-01-30 00:12:58 +01:00
Laurent Destailleur
7c2ac4b3ee
NEW The probability of lead/opportunity can be defined per lead.
2016-01-28 20:04:02 +01:00
Laurent Destailleur
cd58c93de6
FIX If option to hide automatic ECM is on, dont show menu.
2016-01-28 12:51:34 +01:00
Laurent Destailleur
99b2236260
FIX Selection of project must no show closed project
2016-01-28 12:19:13 +01:00
Laurent Destailleur
c09fa6e0dd
Fix empty keys are not allowed into select
2016-01-28 12:19:06 +01:00
Laurent Destailleur
df4cd3de17
FIX Selection of project must no show closed project
2016-01-28 12:05:14 +01:00
Laurent Destailleur
06bbf4c966
Fix empty keys are not allowed into select
2016-01-27 21:10:42 +01:00
phf
4baff7898d
FIX insert FactureLigne
...
FIX phpunit PriceTest with new values returned for multicurrency module
NEW add test in PriceTest
FIX FactureTest properties not defined
2016-01-26 22:18:31 +01:00
phf
83f90e2b1f
Merge branch 'new_multicurrency_module' of github.com:atm-ph/dolibarr into new_multicurrency_module
...
Conflicts:
htdocs/commande/card.php
2016-01-25 21:50:43 +01:00
phf
b2b787f1ff
FIX Travis
2016-01-25 21:33:14 +01:00
phf
8e933ebb2d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module
2016-01-25 19:31:35 +01:00
Laurent Destailleur
ce02f05d43
Translation of dashboard
2016-01-25 17:18:17 +01:00
Laurent Destailleur
274caf61eb
NEW Add statistics for interventions module
2016-01-25 13:34:05 +01:00
Laurent Destailleur
467dc12a7b
NEW Module "Supplier commercial proposal" (price request) is set to
...
stable status.
2016-01-25 12:33:38 +01:00
Laurent Destailleur
ba833dc412
Work on CMS module
2016-01-24 21:35:41 +01:00
Laurent Destailleur
8d46a56dac
Work on CMS module
2016-01-24 21:17:11 +01:00
Laurent Destailleur
c1ebdd3b4f
Default url is home
2016-01-24 11:35:33 +01:00
aspangaro
73d5e7036f
Refactoring eldy menu to test
2016-01-24 08:21:18 +01:00
aspangaro
e5808f876d
Merge remote-tracking branch 'Upstream/3.9' into 3.9-p6
2016-01-24 07:04:20 +01:00
phf
963d0c396b
FIX change rate on order/invoice do not update lines
...
NEW if we change the currency on already existing propal/order/invoice the
current rate is update too then update lines
2016-01-23 21:36:07 +01:00
Laurent Destailleur
469a44a4cf
NEW Include number of linked files into badge counter of "Linked files"
...
tab.
2016-01-23 17:23:00 +01:00
Laurent Destailleur
da93e35dbb
NEW Include number of linked files into badge counter of "Linked files"
...
tab.
2016-01-23 17:19:34 +01:00
phf
9376699299
FIX travis missing comment for new param
2016-01-23 16:16:15 +01:00
phf
373225272b
FIX reorder the display of currency and rate on propal/order
...
FIX update line on propal/order
NEW add mulitcurrency on customer invoice
2016-01-23 16:01:55 +01:00
Laurent Destailleur
4df584e57b
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
2016-01-23 11:51:56 +01:00
Laurent Destailleur
dbaa43f3be
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/holiday/card.php
htdocs/holiday/list.php
htdocs/user/card.php
2016-01-23 11:45:39 +01:00
Laurent Destailleur
dc438792f4
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/fourn/commande/card.php
2016-01-23 11:39:37 +01:00
Laurent Destailleur
9be246baa5
Merge remote-tracking branch 'origin/3.6' into 3.7
2016-01-23 11:32:06 +01:00
phf
e86ebd6799
NEW add multicurency on customer order
2016-01-23 00:38:17 +01:00
phf
21db62d645
FIX multicurrency price always display and update line price if rate is
...
update
2016-01-22 22:35:32 +01:00
Laurent Destailleur
fedf1f3288
Fix view of product image when using old path
...
Fix size of image uploaded on user.
2016-01-22 14:02:48 +01:00
Laurent Destailleur
a406334643
Merge pull request #4458 from atm-alexis/FIX_bad_pdf_refetch_erase_hook_modification
...
FIX line refetch incompatible with hook practice
2016-01-22 04:10:06 +01:00
Laurent Destailleur
93b2013aa7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/projet/tasks/list.php
2016-01-22 03:29:55 +01:00
Laurent Destailleur
cceeefb7c2
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/societe/index.php
2016-01-22 03:25:30 +01:00
Laurent Destailleur
cbd01bae49
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/admin/dict.php
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/societe/index.php
2016-01-22 03:18:51 +01:00
Laurent Destailleur
d857b3475b
Fix doxygen
2016-01-22 03:07:46 +01:00
Laurent Destailleur
cc71445b45
Fix: Only one name for one same feature.
2016-01-22 02:41:51 +01:00
Laurent Destailleur
e6653ea14f
Merge pull request #4333 from defrance/patch-94
...
Parameters harmonization of hook call
2016-01-22 02:35:21 +01:00
Laurent Destailleur
d2f5f5c01f
Merge pull request #4266 from fappels/develop_multi_warehouse
...
Add shipping and dispatching from/to multiple warehouses
2016-01-22 02:26:25 +01:00
Laurent Destailleur
d7847a8ec8
Merge pull request #4256 from GPCsolutions/dolibarr-mysqli
...
[Qual] mysqli code review
2016-01-22 02:22:47 +01:00
Laurent Destailleur
219ce73ea2
Merge pull request #4417 from atm-arnaud/3.8_fix_factures_nblignes_after_hook
...
FIX nblignes not calculated after hook and hook can't modify this val...
2016-01-22 02:10:36 +01:00
Laurent Destailleur
4e87afddf1
Fix: why a floating float here ?
2016-01-21 22:44:05 +01:00
Laurent Destailleur
35d9b25d82
Fix: why a floating float here ?
2016-01-21 22:43:20 +01:00
phf
68857499d7
NEW display multicurrency price on azur pdf model
2016-01-21 22:26:51 +01:00
phf
8487058c98
FIX add input multicurrency_subprice on edit line
2016-01-21 21:54:57 +01:00
phf
f7afbcff68
NEW integration of multicurrency module (creation fields in database and admin)
...
NEW add multicurrency_code on create, update and fetch company object
NEW add multicurrency on propal
FIX travis
FIX back quote into sql file
2016-01-21 21:38:52 +01:00
Laurent Destailleur
dd6e60630d
Fix size of cells make page too large even for large screen
2016-01-21 15:01:53 +01:00
Laurent Destailleur
3c68ac55b9
Fix missing loading lang
2016-01-21 15:00:39 +01:00
Laurent Destailleur
19bcdb6910
Fix size of cells make page too large even for large screen
2016-01-21 14:56:26 +01:00
jfefe
7c4a9d140b
Replace reserved keyword "Resource" by "DolResource"
...
# Conflicts:
# htdocs/resource/list.php
2016-01-21 11:26:21 +01:00
Laurent Destailleur
b8f52edf84
FIX: Sql syntax error in doc_generic_task_odt
2016-01-21 11:20:27 +01:00
phf
605d830d10
FIX if we dont use SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE the hour is displayed on pdf
2016-01-21 11:20:27 +01:00
Laurent Destailleur
988c0131d2
Fix: markRate can be 100
2016-01-21 11:20:27 +01:00
Laurent Destailleur
236d4d7771
Fix add Croatia into list of country in EEC
2016-01-21 11:20:27 +01:00
Sergio Sanchis Climent
4d75039688
Edited correctly for check values
2016-01-21 11:20:27 +01:00
Sergio Sanchis Climent
0467dac43d
Fix userlocaltax
...
Is posible userlocaltax1_rate or userlocaltax2_rate have value 0.0000 and no enter in if, now check if diferent 0 and now enter
2016-01-21 11:20:27 +01:00
Laurent Destailleur
03461d124a
Fix activation of cron jobs by external module
...
Clean code for task lists pages.
2016-01-19 23:45:03 +01:00
Laurent Destailleur
7c445a6d66
Fix missing loading lang
2016-01-19 12:06:11 +01:00
Alexis Algoud
48d674578b
FIX line is refetch (and seems useless) unless it was modified by the hook previous calling
2016-01-19 11:54:07 +01:00
Laurent Destailleur
0f456c46ab
Clean project pages to work like other modules
2016-01-18 16:43:15 +01:00
Laurent Destailleur
8e882b4cc2
NEW Add warning on tasks when they are late (add also the warning
...
tolerance parameter)
2016-01-18 15:56:51 +01:00
Laurent Destailleur
9642967c1f
NEW Indicator on workboard are red/green if late or not.
2016-01-18 12:57:24 +01:00
Laurent Destailleur
6bccac5691
NEW Add Expense report to approve into workboard
...
NEW Selection of boxes is move on top
2016-01-18 11:35:45 +01:00
Marcos García de La Fuente
da637db162
FIX #4440 Wrong price is filled by Product::fetch into multiprices arrays
2016-01-18 10:17:59 +01:00
Laurent Destailleur
4b94c2ade7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-01-17 19:03:23 +01:00
Laurent Destailleur
2f3baca9b4
Fix bad translation
2016-01-17 19:03:12 +01:00
Laurent Destailleur
be4f9baac6
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2016-01-16 10:21:52 +01:00
Laurent Destailleur
d46c655fb4
FIX: Sql syntax error in doc_generic_task_odt
2016-01-16 10:20:14 +01:00
Laurent Destailleur
4a009d2ad2
NEW On translation admin page, admin can overwrite a translation value.
2016-01-16 00:48:14 +01:00
Laurent Destailleur
7f4386f739
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-15 01:53:21 +01:00
Laurent Destailleur
6acd31f8ad
Fix: style required in create or edit mode only
2016-01-15 00:44:38 +01:00
Laurent Destailleur
85898ec977
Fix bad test
2016-01-14 23:48:47 +01:00
Laurent Destailleur
524614ded9
Start to work on a per type view of agenda
2016-01-14 16:52:46 +01:00
Laurent Destailleur
a6416b8797
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-14 15:00:59 +01:00
Laurent Destailleur
0951042dad
Fix: no need of translation tab if multilang was disabled.
2016-01-14 15:00:31 +01:00
arnaud
8b2541ebf9
FIX nblignes not calculated after hook and hook can't modify this value. Usefull for modules
2016-01-14 14:10:50 +01:00
Laurent Destailleur
fef3bed4ba
Fix bad name of var
2016-01-14 13:32:31 +01:00
Laurent Destailleur
7b14b5e115
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
2016-01-14 13:30:27 +01:00
Laurent Destailleur
23e90974c4
Prepare to split module supplier into supplier_order and
...
supplier_invoice
2016-01-14 13:24:49 +01:00
Laurent Destailleur
23dd6b8388
Fix bad management of option SOCIETE_DISABLE_PROSPECTS and
...
SOCIETE_DISABLE_CUSTOMERS
2016-01-14 12:35:55 +01:00
Laurent Destailleur
63ebd40ceb
Fix bad var value
2016-01-14 11:22:59 +01:00
Laurent Destailleur
0f5e208127
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-13 20:43:49 +01:00
Laurent Destailleur
13f10d55fc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-01-13 20:42:32 +01:00
Laurent Destailleur
71b264dd86
FIX Bug: Delivery order and date are not displayed #4372
...
Link between shipment and delivery receipt was lost.
Status for receipt must not use same label than shipments.
2016-01-13 20:41:32 +01:00
fappels
284722ef3c
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse
2016-01-13 16:41:34 +01:00
phf
d213fbae08
FIX invoice situation
2016-01-13 13:42:58 +01:00
Laurent Destailleur
9ba25be9bb
Change category for application
2016-01-13 13:37:24 +01:00
Laurent Destailleur
f74dfe282b
Fix missing default setup when module is enabled
2016-01-13 13:36:44 +01:00
Laurent Destailleur
d396612a7c
NEW: Add a new method for margin calculation. Added margin on "cost
...
price" to margin on WAP price and margin on "best supplier price".
2016-01-13 12:48:59 +01:00
Raphaël Doursenaud
9eff599f97
[Qual] Mysqli: constructor cannot return a value
2016-01-13 11:55:59 +01:00
Raphaël Doursenaud
aeb3935e31
[Qual] Mysqli: escape with the proper method
2016-01-13 11:55:59 +01:00
Raphaël Doursenaud
87762f14b5
[Qual] Mysqli: OOP style
2016-01-13 11:55:59 +01:00
Raphaël Doursenaud
daa3ce3591
[Qual] Mysqli: set charset with recommended method
2016-01-13 11:55:59 +01:00
Laurent Destailleur
381eea0dbf
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-01-12 23:10:25 +01:00
fappels
51b08f579b
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse
...
Fix Conflicts:
2016-01-12 13:56:00 +01:00
phf
f280061a90
FIX if we dont use SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE the hour is displayed on pdf
2016-01-12 11:09:47 +01:00
Laurent Destailleur
a9f0d6964a
Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8
2016-01-10 18:47:47 +01:00
Laurent Destailleur
801e2bca4b
Fix #4239
2016-01-10 18:42:35 +01:00
Laurent Destailleur
cdaccf7c4b
Fix: markRate can be 100
2016-01-10 18:28:50 +01:00
aspangaro
a88773cb81
Fix: Some problems presentation on accountancy module
2016-01-10 15:44:14 +01:00
Laurent Destailleur
70b57322a2
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2016-01-10 13:05:35 +01:00
Laurent Destailleur
6685502d5c
Fix add Croatia into list of country in EEC
2016-01-10 13:05:22 +01:00
Laurent Destailleur
e9e081bc37
Merge pull request #4292 from bafbes/patch-13
...
Include local constants files and fetch their values to the correspon…
2016-01-10 12:03:40 +01:00
Laurent Destailleur
6684bdce84
Merge pull request #4349 from benlo06/fr_4347
...
CLOSE #4347 Add payment label to invoices csv exports
2016-01-10 11:47:25 +01:00
Laurent Destailleur
70ffcfea33
Merge pull request #4380 from aspangaro/3.9-p4
...
Fix: Donation some problems with french article
2016-01-10 11:46:12 +01:00
aspangaro
965a96784c
Fix: Donation some problems with french article
2016-01-10 07:35:00 +01:00
aspangaro
af9e46d179
Fix: Wrong language file for 2 menu entries in accountancy module
2016-01-10 06:56:20 +01:00
Laurent Destailleur
8653e7fa5c
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-10 00:12:51 +01:00
Laurent Destailleur
2764fb240f
Fix text color for category tags
...
Fix banner for category translation tab
2016-01-10 00:11:49 +01:00
Juanjo Menent
c47e18b7e2
Merge pull request #4197 from atm-ph/new_mail_input_file_multiple
...
NEW hidden conf to use input file multiple from mail form
2016-01-09 17:57:50 +01:00
Juanjo Menent
c7ae943e57
Merge pull request #4311 from FHenry/develop
...
NEW : if nb total of lines provided in print barre_liste, display beside title
2016-01-09 17:52:05 +01:00
Juanjo Menent
56af0761ee
Merge pull request #4295 from aspangaro/develop-a8
...
Accountancy Add a list to select accounting account on donation admin
2016-01-09 17:46:02 +01:00
Juanjo Menent
095ee47724
Merge pull request #4268 from aspangaro/develop-a7
...
Accountancy Review page to init accountancy on product/service
2016-01-09 17:45:42 +01:00
Juanjo Menent
400a1f9825
Merge pull request #4253 from aspangaro/develop-a5
...
Move fiscal year from accountancy module to configuration of Dolibarr
2016-01-09 17:42:29 +01:00
Laurent Destailleur
b2924885aa
Fix css
2016-01-09 03:00:12 +01:00
Laurent Destailleur
a8758fa5b7
Bug war week-end: Fix a duplicate page on holiday, fix missing badge on
...
some documents tabs.
2016-01-09 01:54:46 +01:00
Laurent Destailleur
e5d0bc9d57
Fix permission not used
2016-01-09 00:34:15 +01:00
Laurent Destailleur
a0d11e157b
Fix select2 component go over parent container so we introduce option to
...
deal this.
2016-01-08 23:17:45 +01:00
Laurent Destailleur
de36db19bc
Fix do not show warehouse for shipment on not predefined product
2016-01-08 18:15:53 +01:00
Benlo
4aef3d29c1
FIX 4347 : Add labels in translations and change order
2016-01-08 15:03:46 +01:00
Laurent Destailleur
d4aa83e7ca
Merge pull request #4343 from grandoc/develop
...
translations
2016-01-08 14:07:05 +01:00