Commit Graph

4088 Commits

Author SHA1 Message Date
Laurent Destailleur
c360189d94 Code comment 2016-07-06 11:14:17 +02:00
Laurent Destailleur
b4c8822281 Fix style of text after ref on invoices 2016-07-05 16:27:14 +02:00
florian HENRY
fc2e7fb1ad FIX #5446 2016-07-05 15:45:33 +02:00
Laurent Destailleur
525b2cf297 Fix: Edition of contract on intervention failed 2016-07-02 12:02:51 +02:00
Laurent Destailleur
59f86a12d2 Fix delete of documents generated on project.
Fix missin translation
2016-07-01 17:49:13 +02:00
Laurent Destailleur
62d7303d8f Add comment 2016-07-01 03:40:48 +02:00
Laurent Destailleur
05384b2f88 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/fourn/facture/list.php
	htdocs/projet/card.php
	htdocs/societe/consumption.php
2016-07-01 02:39:29 +02:00
Laurent Destailleur
29e26c2342 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/core/lib/sendings.lib.php
2016-07-01 02:06:30 +02:00
florian HENRY
215f397f33 Cannot reproduce 4793 still fix other bug on PgSQL 2016-06-30 17:28:13 +02:00
fmarcet
e4a2b5abb3 Fix: Incorrect document link on supplier invoices's list 2016-06-30 11:27:29 +02:00
Laurent Destailleur
dcfc385645 Fix to avoid blocking error in auto upgrade process 2016-06-29 12:26:01 +02:00
Laurent Destailleur
5aa561598f Fix exit into functions 2016-06-28 02:22:01 +02:00
Laurent Destailleur
d6e15fe8f3 Increase max size of number of product into list 2016-06-26 23:15:20 +02:00
Laurent Destailleur
f021a8ca31 FIX Bad error management into trigger of mailmanspip 2016-06-25 18:48:50 +02:00
Laurent Destailleur
2767df2e01 FIX Solve problem of sending joinded files of another email when several
tabs are opened on form to send emails.
2016-06-24 16:10:52 +02:00
Laurent Destailleur
6033b09344 FIX: A constructor must not return a value.
FIX: A topic is required to send an email (probability to be spam of
99%)
2016-06-24 15:36:20 +02:00
Laurent Destailleur
0bf0937cc6 FIX: disabled templates must be not visible. 2016-06-24 13:08:34 +02:00
Laurent Destailleur
453c6264bf FIX: Hidden option EXPORTTOOL_CATEGORIES was not working correctly 2016-06-24 02:19:41 +02:00
Laurent Destailleur
227bdb9838 FIX extrafields was not visible on tab "subscription"
FIX Link between membership and invoice was not saved
2016-06-24 00:45:35 +02:00
Laurent Destailleur
d72d22cda4 Fix confusing translation 2016-06-23 23:22:30 +02:00
Laurent Destailleur
91e13d23fe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-23 20:20:16 +02:00
Scrutinizer Auto-Fixer
23620e3133 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-06-23 18:19:43 +00:00
Laurent Destailleur
2223ec15d1 Fix doxygen errors 2016-06-23 20:19:35 +02:00
Laurent Destailleur
4a408e76e7 Fix download of mass generated files. 2016-06-22 21:06:08 +02:00
Laurent Destailleur
52f414ad73 Fix selection of visible fields on customer and supplier lists. Filters
are ok now. Order of list of fields in selection is same than in output
array.
2016-06-21 15:16:33 +02:00
Laurent Destailleur
6317cb53f2 FIX Merge of 2 thirdparties when there is one common tag. 2016-06-20 15:42:16 +02:00
Laurent Destailleur
7f4e163a52 Fix scrutinizer reports 2016-06-20 02:37:02 +02:00
Laurent Destailleur
8187dc2006 Fix css 2016-06-19 16:07:34 +02:00
Laurent Destailleur
34c741bf0d FIX CSS and responsive behaviour (feature with a menu hider is on on
smarpthone)
2016-06-17 16:28:16 +02:00
Laurent Destailleur
5b5b7a2bf9 FIX Bad value used for task warning delay
FIX Compatibility datee and date_end for warning of tasks
2016-06-15 14:05:48 +02:00
Laurent Destailleur
aed2c5cb30 Clean css 2016-06-10 18:41:18 +02:00
Laurent Destailleur
9019576394 Fix css class opacitymedium was not used everywhere. 2016-06-07 15:58:02 +02:00
Laurent Destailleur
c7065cc3b8 Minor esthetic fixes 2016-06-07 13:15:38 +02:00
Laurent Destailleur
293c8e145a Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/imports/import.php
	htdocs/langs/en_US/admin.lang
2016-06-05 02:20:27 +02:00
Laurent Destailleur
c09dbe05b3 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/core/class/ldap.class.php
	htdocs/expensereport/card.php
	htdocs/langs/en_US/admin.lang
2016-06-05 00:25:08 +02:00
Laurent Destailleur
db2269b9dd Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/core/class/ldap.class.php
	htdocs/langs/en_US/admin.lang
2016-06-05 00:12:34 +02:00
Maxime Kohlhaas
3ef9fe2c40 Fix product supplier price modification with multicompany 2016-06-04 18:10:40 +02:00
BENKE Charlie
d86f89a8fa fix : #4853
append if not contact type for the element
2016-06-04 17:55:28 +02:00
phf
8ccda16ef3 Fix call function ldap_connect but not exists 2016-06-04 14:50:32 +02:00
Laurent Destailleur
bfb7923d4c Merge pull request #5268 from atm-ph/fix_multicurrency_conf
Fix conf useful has been commented
2016-06-04 11:37:01 +02:00
Laurent Destailleur
b57476153f Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/societe/consumption.php
2016-06-04 01:14:36 +02:00
phf
495ce2463d Fix switch currency on document do not get the associate rate 2016-06-04 01:13:23 +02:00
phf
cd79675f7a Fix using extrafield type "link to object" show error on edit card 2016-06-03 21:16:25 +02:00
Laurent Destailleur
5106f40a56 Merge branch 'develop_NEW_decrease_stock_expedition_classify' of
https://github.com/atm-alexis/dolibarr into
atm-alexis-develop_NEW_decrease_stock_expedition_classify

Conflicts:
	htdocs/expedition/class/expedition.class.php
2016-06-02 11:23:49 +02:00
Laurent Destailleur
c663ca13b8 Fix edit left menu 2016-06-01 21:41:47 +02:00
Laurent Destailleur
028ff5e84c Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/fourn/facture/card.php
	htdocs/langs/en_US/products.lang
	htdocs/societe/list.php
2016-06-01 17:59:50 +02:00
Laurent Destailleur
40005b8f65 FIX Missing search on barcode, only if defined 2016-06-01 12:15:54 +02:00
Laurent Destailleur
1bc6c4ffa3 Clean code 2016-05-30 20:50:49 +02:00
Laurent Destailleur
460d7ce915 FIX Split of credit note into discount page generates records not
correctly recognised as credit note.
2016-05-30 19:38:28 +02:00
Laurent Destailleur
22d6d9497e Fix ambiguous test on ldap return of getAttributes 2016-05-29 11:20:12 +02:00
Laurent Destailleur
9bd9cda224 Move to HTML5 2016-05-24 16:02:43 +02:00
Laurent Destailleur
3119d77565 Add warning on deprecated param 2016-05-22 16:36:48 +02:00
Laurent Destailleur
634ebaa3b6 Fix into conf.class.php file we must use $this and not $conf 2016-05-21 16:01:14 +02:00
Laurent Destailleur
e6a78739bd Fix translation from a key that is a numeric 2016-05-19 21:12:09 +02:00
Laurent Destailleur
901c7c9517 Link "Backtolist" was missing on products 2016-05-17 02:16:28 +02:00
Alexis Algoud
8d0e5479a0 Rename var 2016-05-14 19:22:27 +02:00
Alexis Algoud
e74e70287f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_decrease_stock_expedition_classify
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/product/stock/replenish.php
2016-05-14 19:14:39 +02:00
Laurent Destailleur
d1d1b824b4 Better coding of #5181. I removed need of external lib. 2016-05-13 20:20:48 +02:00
Laurent Destailleur
698b93cf1e FIX #5179 2016-05-08 12:38:30 +02:00
Laurent Destailleur
5cf8612c58 Fix scrutinizer errors 2016-05-08 12:08:23 +02:00
Juanjo Menent
ae6e233781 Merge pull request #5176 from Dolibarr/scrutinizer-patch-3
Scrutinizer Auto-Fixes
2016-05-07 00:49:57 +02:00
Laurent Destailleur
d484383467 Minor errors 2016-05-06 22:06:23 +02:00
Scrutinizer Auto-Fixer
9508d8a5c0 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-05-06 19:10:59 +00:00
Laurent Destailleur
aa55cdadac Merge pull request #4944 from FHenry/develop_advtargetemailiing
NEW : Advance target emailing
2016-05-05 23:18:27 +02:00
Laurent Destailleur
d2df537d43 Merge pull request #5135 from atm-alexis/develop_NEW_allow_link_project
NEW allow a document to be linked to project from another customer
2016-05-05 22:24:32 +02:00
Laurent Destailleur
461f62c200 Use the new global search form 2016-05-05 13:29:42 +02:00
Florian HENRY
3d57e83094 Merge branch 'develop' into develop_advtargetemailiing
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/install/mysql/tables/llx_c_accounting_category.sql
2016-05-02 20:40:42 +02:00
Florian HENRY
fda5e6002f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/websites/index.php
2016-05-02 20:27:34 +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
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
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
Laurent Destailleur
97bf91cc5d Show both currency symbol and code 2016-04-30 14:09:00 +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
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
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
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
Florian HENRY
6ff71792a0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-29 09:00:42 +02:00
Laurent Destailleur
2ea5bf3d5e FIX: Pre selected value was not used on supplier list ouput 2016-04-28 20:04:48 +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
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
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
c7a9f26ee5 NEW : continue hidden extrafield feature 2016-04-26 14:17:19 +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
Christophe Battarel
2a0c508d47 FIX: end of select when no fournprice 2016-04-25 11:26:13 +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
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
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
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
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
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
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
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
a99b7ddee6 Fix PHPCS 2016-04-22 18:12:31 +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
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
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
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
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
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
Laurent Destailleur
08c379ad58 Fix submit photo is no more hidden on smartphone. 2016-04-19 19:15:31 +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
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
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
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
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
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
357877b1fe Debug multicurrency and clean properties of some modules 2016-04-12 14:45:59 +02:00
Florian HENRY
8035742779 FIX fetchAllEMailTemplate 2016-04-11 14:52:22 +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
acf546d982 Move a not used function into a better place. 2016-04-09 19:42:34 +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
83644dcb93 Fix errors reported by scrutinizer 2016-04-09 15:38:15 +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
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
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
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
1a1dc39a6b Mark a duplicate function as deprecated 2016-04-06 14:53:14 +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