lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
58,704 Commits 43 Branches 150 Tags 886 MiB
5.0
Commit Graph

4414 Commits

Author SHA1 Message Date
Laurent Destailleur
7d182c286c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step1.php
	htdocs/projet/tasks/time.php
 2016-10-26 10:40:03 +02:00
Laurent Destailleur
5d655d47fe Enhance css 2016-10-25 12:36:14 +02:00
Laurent Destailleur
6ef74b33c9 Uniformize code 2016-10-25 11:09:26 +02:00
Laurent Destailleur
b15535c1f1 Uniformize code 2016-10-25 02:04:46 +02:00
Laurent Destailleur
36c2b5afcd Responsive 2016-10-24 18:43:17 +02:00
Laurent Destailleur
3b05d00163 Better responsive design 2016-10-24 12:06:33 +02:00
Benoit
a46e7d8e1a Change inputalsopricetotalwithtax to outputalsopricetotalwithtax 2016-10-24 10:18:24 +02:00
aspangaro
d0544b0aea Merge remote-tracking branch 'Upstream/develop' into 5.0-p29 2016-10-24 05:27:49 +02:00
aspangaro
337e9db046 New: Expense report documents are now available in ECM module 2016-10-24 05:26:19 +02:00
Laurent Destailleur
b284bdd953 NEW #5896 More complete data on event sent by email (name in title, 
emails list in details)
 2016-10-24 02:02:30 +02:00
Laurent Destailleur
35601775e0 By default we open a new tab on external url link 2016-10-22 17:05:47 +02:00
Laurent Destailleur
1c59721294 FIX Solve backup when using mysqldump that return warning 2016-10-22 16:20:51 +02:00
Laurent Destailleur
629af89986 FIX Solve backup when using mysqldump that return warning 2016-10-22 16:18:28 +02:00
Laurent Destailleur
f93bca9be9 NEW Can see/make bank conciliation from transaction list 2016-10-21 17:00:31 +02:00
Laurent Destailleur
434b3ef643 Uniformize code and look and feel 2016-10-17 17:52:58 +02:00
Laurent Destailleur
fe471c43d1 Minor css enhancement 2016-10-16 18:28:09 +02:00
Laurent Destailleur
48ce299a38 NEW Option MAIN_INFO_SOCIETE_MAIL_ALIASES to use different identities. 2016-10-15 03:45:23 +02:00
Laurent Destailleur
dfbca2d0ad Merge pull request #5868 from olsesacl/#5830 
NEW: #5830 Allow Generic E-mail Sender
 2016-10-15 02:43:19 +02:00
Laurent Destailleur
1f6ddb485f Fix missing module supplier proposal for external users 2016-10-14 18:22:07 +02:00
Laurent Destailleur
b134f853e5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-13 21:25:48 +02:00
Laurent Destailleur
78e8ab64aa Debug multicurrency 2016-10-13 21:17:46 +02:00
Sergio Sanchis Climent
8556dab68e NEW: #5830 2016-10-13 16:44:17 +02:00
Benlo
4ebd1ff8a2 Permit to print Total TTC price in objectline 2016-10-12 12:30:22 +02:00
Laurent Destailleur
92dc385307 Merge pull request #5838 from atm-gauthier/develop_NEW_filter_by_supplier_on_replenishment_card 
Develop new filter by supplier on replenishment card
 2016-10-11 20:04:02 +02:00
BENKE Charlie
9663883ae4 Unactive user place on bottom list 
More usefull
 2016-10-10 18:15:46 +02:00
Laurent Destailleur
6489cd6164 Debug accounting module 2016-10-07 12:10:16 +02:00
gauthier
fee0a88d27 Merge branch 'NEW_filter_by_supplier_on_replenishment_card' of github.com:atm-gauthier/dolibarr into develop_NEW_filter_by_supplier_on_replenishment_card 2016-10-07 09:25:18 +02:00
gauthier
18496f9159 FIX : params order 2016-10-07 09:19:10 +02:00
Laurent Destailleur
c908af6758 Merge pull request #5833 from atm-gauthier/develop_NEW_cdr_current_or_next_month 
NEW Develop new cdr (current or next month) for payment terms.
 2016-10-07 00:06:59 +02:00
Laurent Destailleur
db3e3642b0 NEW Can generate SEPA mandate for each bank account of your customers 2016-10-06 00:14:25 +02:00
Laurent Destailleur
e79a84a89b Uniformize code 2016-10-05 21:49:04 +02:00
gauthier
ee014681b0 Merge branch 'NEW_filter_by_supplier_on_replenishment_card' of github.com:atm-gauthier/dolibarr into develop_NEW_filter_by_supplier_on_replenishment_card 2016-10-05 15:30:23 +02:00
gauthier
9c8ecdc8d8 NEW : filter by supplier on replenish.php 2016-10-05 15:06:30 +02:00
Laurent Destailleur
9ec520a37a Fix link to on proposal 2016-10-04 20:52:15 +02:00
gauthier
b35a4eb1b2 Merge branch 'NEW_cdr_current_or_next_month' of github.com:atm-gauthier/dolibarr into develop_NEW_cdr_current_or_next_month 2016-10-04 16:01:26 +02:00
gauthier
1c98979ca1 NEW : option "Current/Next" for limit payment date (in payment terms) to use a specific day of current month or jump to same day of next month 2016-10-04 15:45:23 +02:00
Laurent Destailleur
b607fb6be2 Fix do not show link to for disabled modules 2016-10-04 12:52:00 +02:00
Laurent Destailleur
3599f2c840 Uniformize code for recurring invoices 2016-10-04 12:31:45 +02:00
Laurent Destailleur
e37e30cc39 Better responsive 2016-10-04 11:29:48 +02:00
Laurent Destailleur
7967c80179 Code comment 2016-10-03 12:16:32 +02:00
Laurent Destailleur
45a808e034 NEW Generation of document is available on member card 2016-10-03 00:08:47 +02:00
Laurent Destailleur
0d9f28bd61 Fix dash in incoterm label 2016-10-02 16:50:28 +02:00
Laurent Destailleur
f92ca518f7 Uniformize look and feel 2016-10-02 16:38:58 +02:00
Laurent Destailleur
2579cb35dd Minor fix 2016-10-02 11:03:36 +02:00
Laurent Destailleur
e62a12ebe9 Merge pull request #5817 from atm-arnaud/FIX_develop_maxwidthonsmartphone_on_extrafields 
Fix Extrafields edit crashed by maxwidthonsmartphone ...
 2016-10-01 18:59:37 +02:00
Laurent Destailleur
ee252f549a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	dev/skeletons/skeleton_list.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/lib/cron.lib.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
 2016-10-01 18:42:50 +02:00
Laurent Destailleur
cf7327a2a2 FIX #5750 Bug: CmailFile::server_parse enters an infinite loop if 
$server_response is false
 2016-10-01 16:41:12 +02:00
arnaud
0bb7aaa62f Fix Extrafields edit crashed by maxwidthonsmartphone ... 2016-09-30 14:26:04 +02:00
Laurent Destailleur
5c9fa28e79 Fix search on invoice type 2016-09-29 10:38:15 +02:00
Laurent Destailleur
6232e59fd2 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-26 14:17:36 +02:00
Laurent Destailleur
fac946dbb8 FIX The email test sender in email setup was broken 2016-09-26 14:08:14 +02:00
Laurent Destailleur
48b188d200 Merge pull request #5785 from EuskalMoneta/rest-api-add-countries-and-towns 
NEW Add Countries and Towns to the REST API.
 2016-09-26 01:33:56 +02:00
Laurent Destailleur
100312aac2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/adherents/class/cotisation.class.php
 2016-09-26 01:32:50 +02:00
Laurent Destailleur
ea09eb13da Uniformize code 2016-09-26 00:10:29 +02:00
Xebax
d5ee73a1b7 Add Countries to the REST API. 2016-09-25 17:43:15 +02:00
aspangaro
2dbeeedd14 Move tab menu for subscription in member.lib 
Move all pages for subscription member in adherent/subscription (Card / Info / List)
Rename llx_cotisation in llx_subscription
Rename all db field cotisation in subscription
Rename class Cotisation in class Subscription
 2016-09-24 06:48:40 +02:00
florian HENRY
984a56adc5 FIX : #5776 2016-09-23 10:51:31 +02:00
Laurent Destailleur
d4e324d15a Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/facture.php
 2016-09-21 18:38:30 +02:00
Laurent Destailleur
9c12444a03 Fix size of warehouse and height of confirm box 2016-09-21 18:20:18 +02:00
Laurent Destailleur
39c4feaef7 Enhancement for usage on smartphone 2016-09-21 03:54:54 +02:00
Laurent Destailleur
133657a8c7 Uniformize code 2016-09-21 01:25:34 +02:00
Laurent Destailleur
c4c7ccc226 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/societe/note.php
	htdocs/societe/rib.php
 2016-09-19 14:05:16 +02:00
Laurent Destailleur
4f842fd2cb Uniformize look and feel 2016-09-19 13:57:50 +02:00
Laurent Destailleur
079ed88119 Fix missing css 2016-09-19 13:57:18 +02:00
Laurent Destailleur
af28a67803 Uniformize look using dol_banner 2016-09-19 10:43:30 +02:00
Laurent Destailleur
c8b8e13014 Work on dol_banner for proposals. 2016-09-18 21:38:20 +02:00
Laurent Destailleur
6093dfe333 Uniformize code 2016-09-18 12:33:30 +02:00
Laurent Destailleur
72aacb81ae NEW Can use native php and dolibarr object on pages of module website. 2016-09-16 01:13:52 +02:00
Laurent Destailleur
68b3de5b37 NEW ckeditor accept a parameter to disable all html filtering 2016-09-15 23:23:10 +02:00
Sergio Sanchis Climent
93b216e628 FIX: #5699 2016-09-15 05:18:08 +02:00
Laurent Destailleur
39d47eab18 NEW Introduce option MAIN_DEFAULT_PAYMENT_TERM_ID to set default payment 
term on company level.
 2016-09-14 11:17:44 +02:00
phf
0cf5ee2f28 Fix clone object with "link" as extrafield 2016-09-13 10:12:55 +02:00
Laurent Destailleur
0ab377440d Complete param of setValueFrom 2016-09-12 20:16:39 +02:00
Laurent Destailleur
5c1127fc54 NEW Enhance function setValueFrom so we can use it for "edit in form" 
feature.
 2016-09-12 20:00:47 +02:00
Laurent Destailleur
efb05fda6a Cleaner code to avoid to log when nothing is done 2016-09-12 19:58:43 +02:00
Laurent Destailleur
1f9aa856d5 NEW the list of linked files on card does not forget external links. 2016-09-12 18:37:40 +02:00
Laurent Destailleur
5ea9fc7467 NEW Support extrafields on product lot. 2016-09-12 17:27:44 +02:00
Laurent Destailleur
9ff1809f85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/card.php
	htdocs/product/stock/class/productlot.class.php
	htdocs/theme/eldy/style.css.php
 2016-09-12 02:05:38 +02:00
Laurent Destailleur
1bb278a587 Fix #5712 2016-09-11 23:01:04 +02:00
Laurent Destailleur
6d6eceb0ca Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-08 11:39:38 +02:00
Laurent Destailleur
5fdca121aa NEW Can renamed attached files on products and expense reports 2016-09-07 01:54:16 +02:00
Laurent Destailleur
666c62af04 Fix http into https 2016-09-06 00:59:31 +02:00
Laurent Destailleur
d24045d831 NEW Editing translation GUI become easier with search translation tool. 2016-09-04 14:45:43 +02:00
Laurent Destailleur
cb27b01812 Work on feature to find a translation key 2016-09-03 18:47:04 +02:00
Laurent Destailleur
0e4b4ee321 Merge branch 'develop-external-logging' of 
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-develop-external-logging

Conflicts:
	composer.json
 2016-09-02 21:51:25 +02:00
Laurent Destailleur
524dd79198 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/bank/search.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/tasks/time.php
 2016-08-31 00:16:07 +02:00
Laurent Destailleur
5e88de7e2c Fix field customer/prospect/supplier in list of thirdparties 2016-08-28 15:21:09 +02:00
Laurent Destailleur
2e7e5151b7 Merge pull request #5463 from hregis/develop_origin 
New: Add entity field in llx_societe_remise_except and llx_societe_remise
 2016-08-28 12:23:04 +02:00
Laurent Destailleur
fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/sociales/charges.php
	htdocs/core/boxes/modules_boxes.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
 2016-08-28 02:40:20 +02:00
Regis Houssin
6e40f9e700 Merge remote-tracking branch 'dolibarr/develop' into develop_origin 
Conflicts:
	htdocs/core/class/html.form.class.php

Change-Id: I87bdc02d611c2978a5a8b427f0e1b718b6453b59
 2016-08-25 10:15:26 +02:00
Maxime Kohlhaas
52cbdf04c3 Allow to use textwithpicto with a custom picto 2016-08-23 11:03:47 +02:00
Laurent Destailleur
83107746ad Fix no way to fix the ref of recurring invoice when an error was done 
into typing.
 2016-08-19 16:18:39 +02:00
Laurent Destailleur
fead7967f2 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/commande/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/resource/class/resource.class.php
 2016-08-17 16:55:39 +02:00
Laurent Destailleur
282c50ef34 Merge pull request #5631 from atm-florian/4.0 
FIX #5594
 2016-08-17 14:08:06 +02:00
Laurent Destailleur
caa0dd75aa Fix responsive design on small smartphone 2016-08-17 11:47:39 +02:00
florian HENRY
0ac090e959 FIX : #5629 DoliDBPgsql::query SQL Error message: ERROR: 22P02: invalid 
input syntax for integer: ""
 2016-08-16 09:07:08 +02:00
florian HENRY
3932a32399 FIX : #5629 PgSQL Interger string stylish error 2016-08-16 09:00:52 +02:00
florian HENRY
aa17564e93 FIX: #5594 2016-08-16 08:54:12 +02:00
Raphaël Doursenaud
49cb61b530
CLOSE #5627 Allowed external logging modules. 
Removed Sentry logging.
 2016-08-16 03:24:04 +02:00
Laurent Destailleur
6b6ee8795c Button filter on boxes is at end of title line 2016-08-11 19:55:29 +02:00
florian HENRY
321814fae3 better fix for #5594 2016-08-09 15:17:19 +02:00
Laurent Destailleur
4d4fc87e2b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/product/stock/productlot_list.php
	htdocs/websites/index.php
 2016-08-09 13:26:08 +02:00
florian HENRY
90cb71f341 revert better fix 2016-08-08 13:54:51 +02:00
florian HENRY
15f187c466 better test 2016-08-08 13:54:03 +02:00
florian HENRY
94487cf411 FIX #5594 2016-08-08 13:43:44 +02:00
Laurent Destailleur
bcd055b378 Move button to link to, in same part of code than code to output links. 2016-08-05 15:30:28 +02:00
Laurent Destailleur
890e6f59c8 NEW Support mass actions for proposals 2016-08-05 13:08:23 +02:00
Laurent Destailleur
e168888c59 NEW Reduce nb of picto on ref into list, merging preview and download 2016-08-05 12:20:11 +02:00
Laurent Destailleur
e1e8254bcf Fix thumbs are using same extension than original. 2016-08-05 04:31:19 +02:00
Laurent Destailleur
544d5af49b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-05 01:15:35 +02:00
Laurent Destailleur
33d12a4492 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/admin.lang
 2016-08-05 01:15:19 +02:00
Laurent Destailleur
7211542e41 Merge pull request #5569 from olsesacl/develop-show-preview-documents 
NEW Preview documents
 2016-08-05 01:13:35 +02:00
Laurent Destailleur
4e483c675e Merge branch 'dev_add_color_on_select_product' of 
https://github.com/atm-florian/dolibarr into
atm-florian-dev_add_color_on_select_product

Conflicts:
	htdocs/core/class/html.form.class.php
 2016-08-05 00:44:24 +02:00
Laurent Destailleur
26f553a1a8 Fix bad position of test 2016-08-04 12:04:43 +02:00
Laurent Destailleur
7a7e7b330f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-04 11:58:11 +02:00
Laurent Destailleur
7f6e2a277a NEW Link between objects can be done on both side and on all objects 2016-08-04 11:57:37 +02:00
Laurent Destailleur
e0b9496f9e Fix link sometimes fails because of id not defined 2016-08-04 10:44:17 +02:00
florian HENRY
13f33ab9c7 syntax 2016-08-04 09:23:10 +02:00
florian HENRY
a013e84e0e NEW : Add color regarding stock even on ajax autocompleter product 
selector
 2016-08-04 09:21:04 +02:00
Laurent Destailleur
b97223edd7 Fix: link to link to objects not visible 2016-08-03 19:01:51 +02:00
Laurent Destailleur
6ae8d26a89 Fix max width on combo of tasks 2016-08-03 00:04:38 +02:00
Laurent Destailleur
f0c75388cb Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/api_commande.class.php
	htdocs/compta/facture/class/api_invoice.class.php
	htdocs/product/class/api_product.class.php
	htdocs/societe/class/api_contact.class.php
	htdocs/societe/class/api_thirdparty.class.php
 2016-08-02 17:43:12 +02:00
Sergio Sanchis Climent
5fe0d601da New: Preview documents 2016-08-02 03:35:22 +02:00
Laurent Destailleur
e335ce6f45 Fix bad var declared 2016-08-01 19:54:03 +02:00
Laurent Destailleur
b267402df6 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php
 2016-08-01 15:15:32 +02:00
Laurent Destailleur
51e941b9b4 Fix for option MAIN_OPTIMIZEFORTEXTBROWSER 2016-07-31 13:07:55 +02:00
Laurent Destailleur
79222c732d Fix bad var 2016-07-31 02:56:08 +02:00
Laurent Destailleur
d60ac77ad3 NEW The autofill zip/town table option is on by default. 2016-07-30 15:49:39 +02:00
Laurent Destailleur
45e37c82cd FIX #5539 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/fourn/facture/list.php
 2016-07-29 16:29:31 +02:00
Laurent Destailleur
b85bb8c0f8 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2016-07-29 16:24:02 +02:00
Laurent Destailleur
b3cdb1f163 FIX tag for date rfc in odt substitution 2016-07-29 16:21:28 +02:00
Laurent Destailleur
9ca7f2cb66 Better support for option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN (on by 
default).
 2016-07-28 19:02:23 +02:00
Laurent Destailleur
00118610bb A fix to make editinplace working better 2016-07-28 15:29:46 +02:00
Laurent Destailleur
aae2086ada Move notes on dedicated tabs like other elements. 
Rename also the note available into translation tab into "other" to
avoid confusion because it was not the same usage.
 2016-07-28 13:53:17 +02:00
Regis Houssin
6bf655c882 Merge remote-tracking branch 'dolibarr/develop' into develop_origin 
Conflicts:
	htdocs/societe/class/societe.class.php

Change-Id: I760cee3a4d7a59d6625efed8aa5dc16c9df043bb
 2016-07-28 09:53:10 +02:00
Laurent Destailleur
8b3136cb96 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/companies.lang
 2016-07-27 19:04:55 +02:00
Sergio Sanchis Climent
3b57727542 PHP7 warnings on project module's configuration page 2016-07-26 22:22:55 +02:00
Regis Houssin
4b8f42949c # WARNING: head commit changed in the meantime 
Change-Id: I27dc1da6ca41955468f3661433e41c72a277f670
 2016-07-25 21:05:11 +02:00
Marcos García de La Fuente
3029fd0fe1 FIX #5540 getFormMail is not registered as addReplace hook 2016-07-25 13:18:41 +02:00
Marcos García de La Fuente
3ef3a038cf Merge branch '3.9' into bug-5537 2016-07-25 11:50:08 +02:00
Marcos García de La Fuente
a9d75b2c91 FIX #5537 AJAX project search does not work properly 2016-07-25 11:49:04 +02:00
BENKE Charlie
415bdbe9b5 Update html.formfile.class.php 2016-07-25 11:22:53 +02:00
Laurent Destailleur
08d23b482b NEW Introduce mass action "delete" on sales orders. 2016-07-23 12:17:47 +02:00
Laurent Destailleur
af09528738 NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and 
__AMOUNT_WO_TAX__ into emails templates.
 2016-07-21 20:45:30 +02:00
Laurent Destailleur
93bb929219 Merge pull request #5405 from atm-florian/dev_new_password_extrafeilds_type 
NEW : Add new password extrafields type
 2016-07-21 14:01:07 +02:00
Laurent Destailleur
058c431483 FIX The project was lost when creating the event "sent by email". Also, 
event company "create" was not tracked by default like others.
 2016-07-21 13:49:10 +02:00
Laurent Destailleur
34d1c0af72 Merge pull request #5321 from frederic34/patch-7 
Fix quotes not required on int
 2016-07-20 19:09:09 +02:00
Laurent Destailleur
e2a03d18dd Merge remote-tracking branch 'origin/4.0' into develop 2016-07-16 19:58:36 +02:00
Laurent Destailleur
553981426e Several minor fixes in expense reports 2016-07-16 15:21:38 +02:00
Laurent Destailleur
6fcd9e8dbf Merge pull request #4612 from bafbes/abb-1 
FIX Target object does not need to have all extrafields of source object.
 2016-07-15 17:41:29 +02:00
Laurent Destailleur
9ba1ca5acb Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14 
Conflicts:
	htdocs/langs/en_US/companies.lang
 2016-07-15 17:05:12 +02:00
Laurent Destailleur
1b070babc8 Merge remote-tracking branch 'origin/4.0' into develop 2016-07-15 14:23:44 +02:00
Laurent Destailleur
fdfe4d9ac5 Fix missing getFormMail as "addreplace" hook 2016-07-15 14:21:07 +02:00
Bahfir Abbes
5966170a0d Done, thanks 2016-07-15 10:43:01 +01:00
Laurent Destailleur
a5123c06db Save the virtualhost so we can test without entering it each time. 2016-07-14 19:42:04 +02:00
Laurent Destailleur
fabd74169f Fix: missing 'Maximize' button on full toolbar set of ckeditor. 2016-07-14 11:46:32 +02:00
Laurent Destailleur
329bdfc9fd FIX We must take last recent price when using several level of prices 2016-07-11 11:35:38 +02:00
Laurent Destailleur
0367cee671 FIX We must take the last recent defined price when using price level 2016-07-11 11:34:11 +02:00
Laurent Destailleur
a258663175 Fix edition of status were loosing old percent. We show it to allow user 
to keep it if required.
 2016-07-09 14:58:51 +02:00
Laurent Destailleur
93c9e81c33 Fix better size on list 2016-07-09 12:05:09 +02:00
Laurent Destailleur
d8d938e82c Fix performance problems Enter new time spent duration becoma < 1s 
instead of 30s with 5000 tasks.
 2016-07-08 17:06:12 +02:00
Laurent Destailleur
a95335d869 Fix missing ref of task 2016-07-08 16:20:11 +02:00
Laurent Destailleur
d940cc392a FIX Several fix to exclude WON/LOST of reporting of opportunities amount 
(sometimes we need, sometimes not).
 2016-07-08 10:59:13 +02:00
Laurent Destailleur
5ebbe02853 Fix missing trackid into parameters of hooks 2016-07-07 16:26:00 +02:00
Regis Houssin
ee02ff43d7 Fix: add entity field in llx_societe_remise_except, useful when 
third-sharing is used with multicompany
 2016-07-07 12:26:30 +02:00
florian HENRY
2d932066c7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_new_password_extrafeilds_type 2016-07-07 09:17:39 +02:00
Laurent Destailleur
f756f3db0e Fix hook context 'all' 2016-07-07 01:23:20 +02:00
Laurent Destailleur
8505c5db09 Code comment 2016-07-06 13:26:49 +02:00
Laurent Destailleur
759b265eeb Merge pull request #5447 from atm-florian/dev_fix5446 
FIX #5446 Extrafields select list filter on other select list do not work
 2016-07-06 11:46:21 +02:00
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
florian HENRY
52f2e228f1 Add new password extrafields type 2016-06-28 10:21:10 +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
Frédéric FRANCE
262dcbea2c Update commonobject.class.php 2016-06-07 18:08:33 +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
abb
23c0a0a64e conflict solved Merge branch 'develop' into abb-14 
Conflicts:
	htdocs/langs/en_US/companies.lang
 2016-05-02 01:28:46 +01:00
abb
9ba129aa0c Merge branch 'develop' into abb-1 2016-05-02 01:17:27 +01: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