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

4141 Commits

Author SHA1 Message Date
Laurent Destailleur
5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/adherents/fiche.php
	htdocs/comm/fiche.php
	htdocs/comm/mailing/fiche.php
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/paiement.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/core/tpl/login.tpl.php
	htdocs/expedition/fiche.php
	htdocs/fourn/commande/fiche.php
	htdocs/fourn/facture/fiche.php
	htdocs/fourn/facture/paiement.php
	htdocs/fourn/fiche.php
	htdocs/main.inc.php
	htdocs/product/fournisseurs.php
	htdocs/resource/card.php
 2015-01-18 17:13:42 +01:00
Marcos García de La Fuente
fb186d6ef8 Added delay between mails in Newsletter module 2015-01-18 16:26:26 +01:00
Laurent Destailleur
7c5927ef93 Merge branch 'bug-1796' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1796

Conflicts:
	ChangeLog
 2015-01-18 15:08:49 +01:00
Laurent Destailleur
b3e216b8f1 Merge branch 'bug-1787' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1787

Conflicts:
	ChangeLog
	htdocs/comm/propal.php
 2015-01-18 15:06:54 +01:00
Laurent Destailleur
34fe87536b Merge pull request #2137 from frederic34/printipp 
Printing System which may accept modules
 2015-01-18 13:09:41 +01:00
Laurent Destailleur
ef802d9c39 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2015-01-18 12:31:01 +01:00
Laurent Destailleur
6a294eb02a Fixed: Better fix for backward compatibility 2015-01-18 12:29:55 +01:00
Laurent Destailleur
012c571a6c Fixed: Backward compatibility 2015-01-18 11:50:53 +01:00
Laurent Destailleur
b53b8d2e45 Fixed: Backward compatibility 2015-01-18 11:48:52 +01:00
Marcos García de La Fuente
7f59cf9194 Fix: [ bug #1787 ] Incorrect behaviour of doActions hook 2015-01-17 19:28:27 +01:00
Marcos García de La Fuente
ed839114ab Fixed loading of external numeration modules in FactureFournisseur and Propal 2015-01-17 18:42:19 +01:00
Marcos García de La Fuente
a64084308d Fix: [ bug #1804 ] SQL error when sending email without addresee 2015-01-17 18:12:43 +01:00
Laurent Destailleur
007f18bcf7 Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into 
GPCsolutions-review

Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/cashjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/comm/action/peruser.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/accounting.lib.php
	htdocs/core/lib/report.lib.php
 2015-01-17 15:11:12 +01:00
Laurent Destailleur
30abacd0a6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-17 14:42:42 +01:00
Laurent Destailleur
8cd46e4830 Introduce option MAIN_HTML_TITLE to start to control format of html 
title content.
 2015-01-17 14:34:16 +01:00
Laurent Destailleur
c54355b63a Merge remote-tracking branch 'origin/3.7' into develop 2015-01-16 10:44:41 +01:00
Laurent Destailleur
d16ce7eb96 Fix: Bad var 2015-01-15 02:42:41 +01:00
Laurent Destailleur
362167f319 Fixed: Export was not using user assigned 2015-01-15 02:32:15 +01:00
Laurent Destailleur
ba49cce47a Fix: The filter into event views on user must be done on assigned 
resource, not only owner.
 2015-01-15 02:06:04 +01:00
Laurent Destailleur
806477977d Fix: css 2015-01-14 13:51:21 +01:00
Laurent Destailleur
fc78d632d3 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
 2015-01-09 23:09:10 +01:00
frederic34
60661ae948 Add some "classfortooltip" 2015-01-09 00:07:54 +01:00
Laurent Destailleur
4ee308c77b Fixed: Filter lost after search on date 2015-01-06 20:58:23 +01:00
Laurent Destailleur
033757aafd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
 2015-01-06 00:33:28 +01:00
Laurent Destailleur
337d055872 Merge pull request #2199 from altatof/3.6 
FIX: dont remove price ht if it is forced (ie: calculated by margin rate and cost price, or by external module)
 2015-01-06 00:10:08 +01:00
Marcos García de La Fuente
86100758ff Miscellaneous corrections 2014-12-28 20:13:15 +01:00
frederic34
e937039596 Merge remote branch 'upstream/develop' into printipp 2014-12-28 11:59:58 +01:00
Christophe Battarel
1ab6955494 FIX: dont remove price ht if it is forced (ie: calculated by margin rate 
and cost price, or by external module)
 2014-12-27 11:27:41 +01:00
Laurent Destailleur
5ead994955 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-26 04:57:55 +01:00
Laurent Destailleur
657fc1b91c Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/fiche.php
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/fiche.php
	htdocs/langs/fr_FR/compta.lang
	htdocs/projet/element.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/time.php
 2014-12-26 04:44:15 +01:00
Laurent Destailleur
5215b1e641 Merge pull request #2186 from marcosgdf/bug-575 
Fix [ bug #575 ] GED doesn't works if there is "/" in a mask
 2014-12-26 04:02:01 +01:00
Laurent Destailleur
4bbf16e277 Merge pull request #2178 from frederic34/patch-10 
Add css badge
 2014-12-25 23:25:30 +01:00
Marcos García de La Fuente
aec1bdb3c4 Fixed [ bug #1766 ] PHP Warning when adding a service to a supplier invoice 2014-12-25 23:08:07 +01:00
Marcos García de La Fuente
1f00794c98 Fixed bug which didn't show documents in auto GED when an object had '/' in its ref 2014-12-25 21:47:39 +01:00
Laurent Destailleur
bd7f6339ce Because this is a legal issue (OPCA), i added the hidden constant for 
3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button
"Classified Billed" is visible on proposal even if there is no invoice
linked to proposal.
Fixed: Also fix get list of invoice that report too many data.
 2014-12-25 12:08:35 +01:00
Laurent Destailleur
2c170dbe0e Fixed: Do not show disabled user when creating a new event. 2014-12-25 12:04:39 +01:00
Frédéric FRANCE
6b29c8e5c6 Update index.php 2014-12-23 19:06:51 +01:00
Laurent Destailleur
b7dbb1e9cd Fixed: Do not show disabled user when creating a new event. 2014-12-23 17:46:30 +01:00
Laurent Destailleur
9e2f57007b Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-12-23 12:59:54 +01:00
Laurent Destailleur
acf7b9f130 Because this is a legal issue (OPCA), i added the hidden constant for 
3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button
"Classified Billed" is visible on proposal even if there is no invoice
linked to proposal.
Fixed: Also fix get list of invoice that report too many data.
 2014-12-23 12:59:34 +01:00
Marcos García de La Fuente
3212fd2b27 Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same thing as modify 2014-12-23 11:00:18 +01:00
frederic34
3bf63ed0a9 Merge remote branch 'upstream/develop' into printipp 2014-12-21 14:59:37 +01:00
Frédéric FRANCE
6f4ba2552d Typo on conf variable 2014-12-21 10:14:51 +01:00
Laurent Destailleur
711b033844 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/stock/card.php
 2014-12-14 12:35:13 +01:00
Frédéric FRANCE
dd2b19d855 Typo 2014-12-09 22:45:27 +01:00
Laurent Destailleur
5f8919c857 Update translation 2014-12-08 23:59:33 +01:00
frederic34
295fe115ab Merge remote branch 'upstream/develop' into printipp 2014-12-08 20:33:50 +01:00
Laurent Destailleur
e95160c218 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/user/agenda_extsites.php
 2014-12-08 17:51:36 +01:00
Laurent Destailleur
6ddae270b9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-07 23:52:02 +01:00
Laurent Destailleur
1e8e7474d8 Fixed: specimen init did not include new vars of 3.7 2014-12-07 21:22:43 +01:00
Laurent Destailleur
634a9d8402 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2014-12-07 19:19:48 +01:00
Laurent Destailleur
3186a8c23f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-07 12:07:53 +01:00
Laurent Destailleur
a59ac280bc Doxygen 2014-12-07 02:19:57 +01:00
Laurent Destailleur
c731321024 New: Function yn can show a visual checkbox 2014-12-07 01:57:23 +01:00
Laurent Destailleur
0459477097 Fix: Miscellaneous fixes for multicompany 2014-12-06 14:41:56 +01:00
Laurent Destailleur
344aa40858 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	.travis.yml
	dev/codesniffer/ruleset.xml
	htdocs/core/class/conf.class.php
	htdocs/langs/en_US/productbatch.lang
 2014-12-05 20:21:40 +01:00
frederic34
5cce8c45e3 WIP PrintIPP 2014-12-05 18:23:54 +01:00
Laurent Destailleur
ceba894d57 Start to work on new generation combo box. 2014-12-05 13:26:47 +01:00
Laurent Destailleur
bff65fc6b4 Fix: starting with var with always same color 2014-12-05 01:25:18 +01:00
Laurent Destailleur
6729544782 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/projet/tasks/task.php
 2014-12-04 14:52:34 +01:00
Laurent Destailleur
83122ebe1e Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now 
for release.
 2014-12-04 13:20:56 +01:00
Laurent Destailleur
f884f16564 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/boxes.php
	htdocs/comm/action/card.php
	htdocs/core/class/html.formfile.class.php
 2014-12-03 12:54:42 +01:00
Laurent Destailleur
da6f3a692b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-01 01:11:42 +01:00
Laurent Destailleur
f3584fa211 Fixed: Button at wrong place 
Fixed: Must use style css span badge for number of files
 2014-12-01 00:53:15 +01:00
Laurent Destailleur
2db6258cb7 Fixed: Button at wrong place 2014-12-01 00:52:38 +01:00
Laurent Destailleur
01209ff844 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/product/stock/card.php
 2014-11-30 14:15:38 +01:00
Laurent Destailleur
3fe2db6c8d Try to find a solution to fight against spam sending from dolibarr when 
phpmail is set.
No time to find a better solution so i add just a hidden option to
disable phpmail function.
 2014-11-29 13:50:41 +01:00
Laurent Destailleur
278cdf72d6 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-29 12:41:26 +01:00
Laurent Destailleur
c7420662e6 Fixed: Module for target emailing must not be visible when modules is 
disabled.
 2014-11-29 12:40:45 +01:00
Laurent Destailleur
a724c3aa70 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/main.inc.php
 2014-11-28 02:26:40 +01:00
Laurent Destailleur
df9a6dae6c Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fichinter/fiche.php
 2014-11-28 02:20:01 +01:00
Laurent Destailleur
dc1c98734e Fixed: Option specific to a module should start with module name 2014-11-28 00:21:52 +01:00
Laurent Destailleur
f9953d52f6 Merge pull request #2091 from frederic34/patch-3 
Fix 1721 Missing translation on proposal creation
 2014-11-28 00:16:44 +01:00
Laurent Destailleur
d9cb9c1585 Merge pull request #2102 from aspangaro/develop-center 
Task 1603 - Remove <center> deprecated HTML5 tags
 2014-11-27 23:58:44 +01:00
Laurent Destailleur
60e5369db2 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/bookmarks/card.php
 2014-11-27 22:01:02 +01:00
Frédéric FRANCE
f769295999 Update apercu.php 2014-11-27 21:03:01 +01:00
Frédéric FRANCE
e179e7d5a5 Fix 1655 Proposal amount not computed in preview 2014-11-26 17:24:26 +01:00
Francis Appels
b1a4b8e7d0 Fix: [ bug #1624 ] POS set buy price for margin 
Use lowest buying price for margin when selling with POS or external
module. A POS user does not worry about suppliers.
 2014-11-25 21:20:13 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Frédéric FRANCE
81f467661e Update propal.php 2014-11-24 20:58:46 +01:00
Frédéric FRANCE
01e6d9fc12 Update /comm/prospect/list.php 2014-11-23 17:45:00 +01:00
Frédéric FRANCE
627e3e0a2b Update /comm/actions/listactions.php 2014-11-23 17:44:57 +01:00
Frédéric FRANCE
e6da4a2518 Update /comm/list.php 2014-11-23 17:43:32 +01:00
Laurent Destailleur
33eae22b26 Merge pull request #2070 from frederic34/patch-5 
(GETPOST("button_removefilter_x") || GETPOST("button_removefilter"))
 2014-11-23 17:40:28 +01:00
Frédéric FRANCE
de48a04844 Fix: W3C. form into table is forbidden. 2014-11-23 12:53:00 +01:00
Frédéric FRANCE
c6f7134414 Update /comm/prospect/list.php 2014-11-23 10:01:07 +01:00
Frédéric FRANCE
8356c1b560 Update /comm/actions/listactions.php 2014-11-23 10:00:09 +01:00
Frédéric FRANCE
46aea31e6c Update /comm/list.php 2014-11-23 09:31:20 +01:00
Laurent Destailleur
02e18bc03d Merge remote-tracking branch 'origin/3.7' into develop 2014-11-22 16:29:06 +01:00
Laurent Destailleur
8b545af325 Merge pull request #1982 from atm-alexis/feature_agenda_files_on_card_view 
add files view into agenda card
 2014-11-22 16:24:09 +01:00
Laurent Destailleur
e8b2206629 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-22 15:57:33 +01:00
Laurent Destailleur
86a3a4f618 Merge branch '1680' of github.com:aspangaro/dolibarr into aspangaro-1680 
Conflicts:
	htdocs/comm/propal/list.php
 2014-11-22 15:57:06 +01:00
Laurent Destailleur
e6e5cb471d Merge pull request #2040 from aspangaro/1681 
#1681 Clear sort filter works partially in customers list
 2014-11-22 15:54:57 +01:00
Laurent Destailleur
6c7bab8d8c Merge pull request #2045 from frederic34/patch-4 
#1682 Date is missing in proposals list
 2014-11-22 15:50:50 +01:00
Laurent Destailleur
86f2f191ea Merge pull request #2046 from frederic34/patch-5 
#1683 Can't clear sort filter on proposals list
 2014-11-22 15:50:37 +01:00
Laurent Destailleur
f7206c2a52 Fixed: [ bug #1578 ] Cannot create proposal by copy of another one 2014-11-19 23:10:30 +01:00
Laurent Destailleur
c8fe538de2 Fix: Filter were lost 2014-11-18 14:37:19 +01:00
Laurent Destailleur
c077998ff8 Fix: Line not visible when there is a lot of lines. 2014-11-18 14:37:14 +01:00
Frédéric FRANCE
5536abecf7 #1683 Can't clear sort filter on proposals list 2014-11-17 23:57:01 +01:00
Frédéric FRANCE
f2eda0629b #1682 Date is missing in proposals list 2014-11-17 23:54:39 +01:00
aspangaro
de7a38417f #1680 Clear sort filter works partially in prospects list 2014-11-17 21:45:29 +01:00
aspangaro
a82953ef70 #1681 Clear sort filter works partially in customers list 2014-11-17 21:18:26 +01:00
Laurent Destailleur
737dfab5b2 Fix: If error on add line of type "product" when creating 
proposal/order/invoice, do not show date of services.
 2014-11-16 19:12:05 +01:00
Laurent Destailleur
c186f13218 Fix: Param $action was not defined. 
A better fix must be done later be removing useless hooks that are
duplicate with triggers.
 2014-11-15 19:04:21 +01:00
Laurent Destailleur
445f696d28 Fix: Pb of object with wrong type. 2014-11-15 18:24:38 +01:00
Laurent Destailleur
d98bfb1d8d Fix: Bugs reported by scrutinizer 2014-11-15 15:19:37 +01:00
Laurent Destailleur
6bac744709 Fix: Missing event management into select when combo not selected 2014-11-13 16:46:40 +01:00
Laurent Destailleur
137b3f898d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2014-11-12 00:02:30 +01:00
Laurent Destailleur
6eabad65b7 Fix: Removed warning 2014-11-11 23:56:03 +01:00
Laurent Destailleur
e3f4db85af Fix divers 2014-11-07 23:07:15 +01:00
aspangaro
acbbe823e8 Typo 2014-11-06 20:04:51 +01:00
aspangaro
a8b3153f54 Improve search in list 2014-11-06 19:47:27 +01:00
Laurent Destailleur
26bd214e72 Merge pull request #1996 from aspangaro/develop-search 
Increase list search
 2014-11-04 17:40:11 +01:00
Alexis Algoud
af7f9e1707 no dol_include 2014-11-04 16:08:07 +01:00
Laurent Destailleur
0a0dd81c9a Fix: When selecting a carbon copy fro select list, mail was not attached 
to user.
 2014-11-04 13:54:18 +01:00
aspangaro
f3d7da8feb Merge remote-tracking branch 'Upstream/develop' into develop-search 2014-11-03 20:25:36 +01:00
Laurent Destailleur
b6b6cced30 Fix: Test sur user assigned not filled 
Can use empty line into select boolean form.
 2014-11-03 20:02:11 +01:00
Laurent Destailleur
54e2803926 Missing search table for interventions 2014-11-03 17:48:10 +01:00
Laurent Destailleur
cf6a0df3e4 A lot of fix in missing intervention trigger. Align key to use same name 
to avoid future bugs.
 2014-11-03 17:23:02 +01:00
Laurent Destailleur
155452ba91 Fix: Proposal deadlock situation 
New: Add missing trigger PROPAL_CLASSIFYBILLED.
 2014-11-03 16:20:55 +01:00
aspangaro
29c6797835 Merge remote-tracking branch 'Upstream/develop' into develop-search 2014-11-03 06:15:45 +01:00
Laurent Destailleur
ddf737daed Removed deprecated page and option. 2014-11-03 01:07:07 +01:00
aspangaro
df5d34266c Lost button 2014-11-02 15:26:20 +01:00
aspangaro
bebf039599 Prospects list 2014-11-02 15:05:20 +01:00
Laurent Destailleur
5086450f35 Fix: Forging email content must use dol_concatdesc. 2014-11-02 12:32:38 +01:00
Laurent Destailleur
8d964e03d2 Merge branch 'agenda-export-by-project' of github.com:AMMD/dolibarr into 
AMMD-agenda-export-by-project

Conflicts:
	htdocs/admin/agenda_xcal.php
 2014-10-30 18:19:13 +01:00
Laurent Destailleur
132ddf65d6 Fix: several bugs into document generation (default must be used in 
priority when not template defined).
Fix: use first odt file when no odt file defined.
Fix: Must use output translation.
 2014-10-27 19:37:30 +01:00
Alexis Algoud
eebf107d5f includes and show_documents 2014-10-27 10:54:50 +01:00
Laurent Destailleur
6f77dc83c4 Qual: Uniformize code and fix a ton of bugs. 2014-10-27 03:24:45 +01:00
Laurent Destailleur
2b08417b77 Fix: [ bug #1612 ] Adding free product line line with negative qty in 
credit notes, doesn't give error message
 2014-10-27 01:51:33 +01:00
Laurent Destailleur
e324df2cb9 Some fix again into event list. 2014-10-20 13:20:19 +02:00
Laurent Destailleur
866b2a7a88 Fix: Label 2014-10-20 13:14:33 +02:00
Laurent Destailleur
881d338fca Fix: label of events 2014-10-20 13:07:54 +02:00
Laurent Destailleur
4df9fb38fb Add option AGENDA_ALWAYS_HIDE_AUTO 2014-10-20 12:29:35 +02:00
Laurent Destailleur
ad0f842b60 Merge branch 'mkoevols' of github.com:atm-maxime/dolibarr into 
atm-maxime-mkoevols

Conflicts:
	htdocs/commande/card.php
 2014-10-18 15:38:49 +02:00
Laurent Destailleur
6bbeaee8fe Fix: Selection of users color was not user owner of event. 2014-10-18 15:35:32 +02:00
Laurent Destailleur
85ce8f8fef Merge pull request #1959 from aspangaro/develop-usercolor 
Add field to select color of the user in user's card
 2014-10-18 14:57:19 +02:00
Laurent Destailleur
14ea66f3b7 Legend 2014-10-18 02:31:48 +02:00
Laurent Destailleur
f1e4f35471 Minor fixes on intervention sql 
No style on view for one day.
 2014-10-17 13:09:18 +02:00
Laurent Destailleur
7988532e4e Fix: Bad closing tab on preview pages. 2014-10-17 12:56:54 +02:00
Laurent Destailleur
e2524fbf77 Fxi: Filter on list view was not correct. 2014-10-16 21:34:35 +02:00
aspangaro
c1d016a531 Add field to select color of the user in user's card 2014-10-16 06:20:54 +02:00
Maxime Kohlhaas
ee4b807a5d Qual : refactoring extrafields display on objects into a single tpl file 2014-10-14 17:00:06 +02:00
Maxime Kohlhaas
452636b0e4 New : Add option to allow extrafield to be modified regardless of the document status 2014-10-14 15:27:40 +02:00
Laurent Destailleur
536b579b35 Clean code 2014-10-14 00:27:23 +02:00
Laurent Destailleur
e42ab9ea84 Add legend on peruser view. 2014-10-13 17:45:52 +02:00
Laurent Destailleur
f498921715 Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into 
GPCsolutions-droposcommerce

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/vi_VN/admin.lang
	htdocs/langs/vi_VN/shop.lang
 2014-10-13 00:50:51 +02:00
Laurent Destailleur
9768550696 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/categories/fiche.php
	htdocs/comm/action/index.php
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/fiche.php
	htdocs/product/composition/fiche.php
	htdocs/product/price.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php
 2014-10-12 02:54:34 +02:00
Laurent Destailleur
c5d8012eb1 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/core/lib/date.lib.php
 2014-10-12 02:13:38 +02:00
Laurent Destailleur
cd8936a224 Clean deprecated code. 2014-10-11 15:04:42 +02:00
Regis Houssin
c01edd76f6 Fix: avoid warning 2014-10-10 16:53:21 +02:00
Laurent Destailleur
e76b5a370d Fix: bad parameter 2014-10-09 17:27:14 +02:00
Laurent Destailleur
06cc08026b Some fix on per user view. 2014-10-09 17:05:57 +02:00
Regis Houssin
a2446e51db New: add context "globalcard" for declaring only once all cards 2014-10-06 07:20:58 +02:00
Laurent Destailleur
c73f4a14ee Fix: Bad days returned by function 2014-10-05 16:17:09 +02:00
Laurent Destailleur
85f0d6c3ea Fix: Edition of event 2014-10-05 04:51:34 +02:00
Laurent Destailleur
c51b964b19 Fix: Pb when showing availability 2014-10-05 03:44:20 +02:00
Laurent Destailleur
5c5f725a34 Fix scrutinizer 2014-10-05 01:22:17 +02:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name" 
everywhere.
 2014-10-04 17:20:17 +02:00
Laurent Destailleur
69475b7bf8 Sync from transifex. 
Fix var not initialized.
 2014-10-04 12:49:30 +02:00
Laurent Destailleur
d518278166 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture/class/facture.class.php
 2014-10-03 19:17:28 +02:00
Laurent Destailleur
dde3b3ef65 Fix: Event update 2014-10-03 18:25:38 +02:00
Laurent Destailleur
f9d78c0c57 Fix: edit event 
New: Can use color of type of event into dictionnary.
 2014-10-03 18:04:13 +02:00
Laurent Destailleur
e7a9447d94 Add hook formatEvent and fix bug into per user view. 2014-10-03 15:58:08 +02:00
Maxime Kohlhaas
920c9c7251 Fix : tva not coming from multiprice 2014-09-30 17:36:01 +02:00
Laurent Destailleur
8ccb581185 Fix: Change for php 5.6 
New: Management of color into type of events dictionnary (visible into
peruser view).
New: Can disable predefined type of events.
 2014-09-29 13:21:03 +02:00
Laurent Destailleur
27d42aa9a4 Fix: On peruser view, fullday event are reported. 
Fix: On peruser view, can start from hour 0.
 2014-09-28 16:54:42 +02:00
Laurent Destailleur
06494b085a Perf enhancement 2014-09-28 16:38:45 +02:00
Laurent Destailleur
cd4c81d15d Uniformize code. 2014-09-28 16:31:37 +02:00
Laurent Destailleur
eea034e0e5 Fix: 1 second missing into lastdaytoshow. 2014-09-28 15:33:13 +02:00
Laurent Destailleur
6a570222cc Fix: Missing fields into select 2014-09-28 14:21:57 +02:00
Laurent Destailleur
52340e9176 Fix: Missing fields into select 2014-09-28 14:18:04 +02:00
Laurent Destailleur
ec95aacd52 Uniformize code for error reporting after a hook. 2014-09-28 03:41:32 +02:00
Laurent Destailleur
4244979f4f Fix: doxygen 
Fix: td balance
 2014-09-28 02:46:20 +02:00
Laurent Destailleur
14ab409ca9 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/stock.php
	htdocs/admin/system/index.php
	htdocs/comm/fiche.php
	htdocs/core/lib/admin.lib.php
	htdocs/core/lib/holiday.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/login/functions_forceuser.php
	htdocs/core/login/functions_http.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/filefunc.inc.php
	htdocs/holiday/define_holiday.php
	htdocs/opensurvey/fonctions.php
	htdocs/societe/canvas/actions_card_common.class.php
	test/phpunit/CompanyBankAccountTest.php
	test/phpunit/ExportTest.php
	test/phpunit/FactureTest.php
	test/phpunit/FunctionsLibTest.php
	test/phpunit/PropalTest.php
	test/phpunit/SocieteTest.php
	test/phpunit/WebservicesInvoicesTest.php
	test/phpunit/WebservicesThirdpartyTest.php
 2014-09-28 02:14:32 +02:00
Laurent Destailleur
5fdd798e91 Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on 
parameter).
 2014-09-27 17:13:15 +02:00
Laurent Destailleur
e8b7c9c6bd Fix: doxygen 2014-09-27 16:00:11 +02:00
Laurent Destailleur
c0e93a17da Add FIXME 2014-09-26 12:42:21 +02:00
Laurent Destailleur
bf4b99fa64 Assignation of event to several users is on a very good way for 3.7 2014-09-26 12:27:18 +02:00
Christophe Battarel
2c52de3840 fix missing "," 2014-09-24 12:12:10 +02:00
Christophe Battarel
d1868b643e FIX: clone line extrafields value on quote, order and invoice 2014-09-24 11:47:34 +02:00
Laurent Destailleur
cdca651ded Doxygen. 
Ad field color
 2014-09-24 01:40:16 +02:00
Laurent Destailleur
a4d8739477 Qual: Clean a lot of deprecated code 2014-09-24 01:35:29 +02:00
Laurent Destailleur
74cba062b4 Add a TODO to explain why we keep some extends into class. 
Should be removed once php min will be 5.4.
 2014-09-23 19:37:59 +02:00
Laurent Destailleur
dd86453020 Add field color into table of type of events 2014-09-23 17:54:03 +02:00
Laurent Destailleur
7224f64224 Work on multi user for events. 
Fix: Modules must be reloaded after migration.
 2014-09-23 16:15:15 +02:00
Laurent Destailleur
640bf7c34b Uniformize field name 2014-09-23 12:18:42 +02:00
Laurent Destailleur
dc96e10215 Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into 
marcosgdf-oop-pdf

Conflicts:
	htdocs/projet/class/project.class.php
 2014-09-23 00:02:19 +02:00
Laurent Destailleur
08d4195504 Merge branch 'develop' of github.com:aspangaro/dolibarr into 
aspangaro-develop

Conflicts:
	htdocs/fichinter/card.php
 2014-09-22 23:34:56 +02:00
Laurent Destailleur
f7f0059767 Missing hook to add button on intervention 
Prepare to move location into resource
Can select which king of contact show into contact tab.
 2014-09-22 20:16:58 +02:00
Marcos García de La Fuente
bf7f4c1cab Refactored generateDocument functions 2014-09-21 18:16:14 +02:00
Marcos García de La Fuente
ca9e33e809 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into oop-pdf 2014-09-21 18:00:56 +02:00
aspangaro
1592968709 Merge remote-tracking branch 'Upstream/develop' into develop 2014-09-20 06:42:31 +02:00
Laurent Destailleur
ad8b92541d Fix: sql request with pgsql 
Fix: bug reported by scrutinizer
Doxygen
Start to work on multi user assigned to an event.
 2014-09-20 00:57:29 +02:00
Laurent Destailleur
ee4d697172 Fix several bugs reported by scrutinizer 2014-09-19 14:57:31 +02:00
Raphaël Doursenaud
bd03cb439d FIX: Function expects an int, not a boolean 2014-09-19 03:07:53 +02:00
Raphaël Doursenaud
b21d85a1da FIX: Function was expecting a boolean not a string 2014-09-19 03:07:53 +02:00
Raphaël Doursenaud
eea9a76589 FIX: Variable might not be traversable 2014-09-19 03:07:52 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521 Qual: Renamed all files & links "liste.php" into "list.php" 2014-09-18 20:33:37 +02:00
Laurent Destailleur
2b602e7b5a Qual: Uniformize param names. contactidp -> contactid 2014-09-18 18:46:00 +02:00
Laurent Destailleur
dfa071e093 Fix: Are description too large 2014-09-18 01:43:50 +02:00
Marcos García de La Fuente
3561c8e6f3 Removed deprecated usage of propale_pdf_create 2014-09-16 20:57:17 +02:00
Marcos García de La Fuente
e71dc6bc32 Created a method generateDocument for several classes 
Which are: Commande, Contrat, Livraison, Facture, Projet, Propal, Task, Expedition, CommandeFournisseur, FactureFournisseur and therefore deprecated the following methods supplier_order_pdf_create, supplier_invoice_pdf_create, delivery_order_pdf_create, task_pdf_create, propale_pdf_create, project_pdf_create, facture_pdf_create, expedition_pdf_create, commande_pdf_create
 2014-09-16 12:30:37 +02:00
Laurent Destailleur
83447243ae Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	build/debian/get-orig-source.sh
	htdocs/product/class/product.class.php
	htdocs/societe/soc.php
 2014-09-15 22:58:39 +02:00
Laurent Destailleur
05f3a47018 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	build/debian/control
	htdocs/compta/bank/account.php
	htdocs/fourn/paiement/fiche.php
	htdocs/product/class/product.class.php
	htdocs/product/fiche.php
 2014-09-15 22:52:59 +02:00
Laurent Destailleur
d8e8b34605 Fix: Removed AGENDA_DEFAULT_TYPE. There is already 
AGENDA_DEFAULT_FILTER_TYPE.
 2014-09-15 19:35:54 +02:00
Laurent Destailleur
c97692a664 Ajout backtopag sur page peruser. 2014-09-15 19:21:30 +02:00
Laurent Destailleur
9ea3e33f94 Fix: Can edit status of event. 
New: Onto event summary of elements, end date and status are visible.
 2014-09-15 19:04:30 +02:00
Laurent Destailleur
19e2bd8c90 New: Add option AGENDA_DEFAULT_TYPE 
Fix: id is not set on field.
 2014-09-15 17:34:32 +02:00
Laurent Destailleur
0d6d064e7e New: PDF event report show project and status of event 
Fix: Can edit description of intervention
New: Show status of object on refere page.
 2014-09-15 12:48:24 +02:00
Laurent Destailleur
2dbbc76645 Fix: Trigger error not reported 2014-09-15 11:48:50 +02:00
Laurent Destailleur
b94d913440 New: Add option AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS to 
automatically set end date of event to start date + delta on creation
page.
 2014-09-15 10:19:08 +02:00
Marcos García de La Fuente
949ae2f160 [ bug #1591 ] Linked object block shows Total HT/TTC even if not having permission to read them 2014-09-14 13:09:31 +02:00
Laurent Destailleur
20bec865fd Fix: checkstyle 2014-09-14 00:27:36 +02:00
Laurent Destailleur
f264e25514 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/compta/bank/bankid_fr.php
	htdocs/holiday/index.php
	htdocs/opensurvey/list.php
 2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214 Fix: SQL injection 2014-09-13 19:04:25 +02:00
Laurent Destailleur
f19e469b5f Work on feature to assign several users to an event. 2014-09-09 14:38:10 +02:00
Laurent Destailleur
9f2b0b4f29 Minor enhancement on agenda module. 
Can filter on date of event.
Local calendar renamed into Internal calendar.
 2014-09-09 12:28:35 +02:00
Laurent Destailleur
2f6493dabd Sync transifex 2014-09-08 11:58:45 +02:00
Laurent Destailleur
b63cfccf49 On peruser agenda view, use different color if event is busy or not for 
user.
 2014-09-08 10:24:16 +02:00
Laurent Destailleur
9720ab1ea5 Fix: Not a required field 2014-09-07 20:22:02 +02:00
Laurent Destailleur
2c46613f4a New: View per user into agenda. 2014-09-07 19:56:17 +02:00
Laurent Destailleur
0cefe5af43 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/comm/action/listactions.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/lib/date.lib.php
	htdocs/fourn/facture/fiche.php
	htdocs/includes/tcpdf/include/tcpdf_static.php
	htdocs/product/price.php
 2014-09-07 13:18:56 +02:00
Laurent Destailleur
342e26f679 Merge 2014-09-07 12:22:04 +02:00
Laurent Destailleur
63bfc093c3 Search on a specific day is possible into per user view. 2014-09-06 17:55:33 +02:00
Laurent Destailleur
cbaa7816bf New: add css style "cursorpointer". 
Start to work on clicable links into peruser agenda view.
 2014-09-06 00:32:54 +02:00
Laurent Destailleur
be0f091474 css for agenda view per user 2014-09-05 21:47:16 +02:00
Laurent Destailleur
a86de9b685 Work on agenda per user. 2014-09-05 21:12:01 +02:00
Laurent Destailleur
de0cf14ece Fix: Bad position of week 2014-09-05 15:10:31 +02:00
Laurent Destailleur
175e3eca6b Work on agenda view per user 2014-09-05 13:48:55 +02:00
Laurent Destailleur
e7e48f6b2b Doxygen 
Add constant to enable bank during proposal (not enough common).
 2014-09-04 22:37:33 +02:00
Laurent Destailleur
73ad0f9302 Fix: Bad use of fetch_lines 2014-09-04 18:58:33 +02:00
Florian HENRY
832d1b37c1 Save also code of event 2014-09-02 11:32:38 +02:00
Florian HENRY
911aca399d save code event 2014-09-02 11:30:35 +02:00
Florian HENRY
c8a9f4600c Fix: list event view lost type event filter 2014-09-02 11:20:57 +02:00
Florian HENRY
67b308cb25 Fix: list event view lost type event filter 2014-09-02 11:15:01 +02:00
Juanjo Menent
a31fec1b0b Fix tab active to real tab active 2014-08-26 19:55:35 +02:00
Laurent Destailleur
a5deeebfdc Add try catch 2014-08-25 19:32:36 +02:00
KreizIT
8d13ab0d4b Fix allday event move 2014-08-18 10:27:35 +02:00
Laurent Destailleur
7edf2eacea New: Each user can include its own external ics calendar into dolibarr 
agenda view.
 2014-08-15 17:08:05 +02:00
Laurent Destailleur
64513c10d9 Fix: Can drag from last day of event. 2014-08-14 00:57:59 +02:00
KreizIT
5514598536 fix travis failure 2014-08-08 15:00:03 +02:00
KreizIT
c9c54e38cc fix wrong if closure 2014-08-08 14:28:27 +02:00
KreizIT
9bf32603fe [ task #1218 ] Can drag and drop an event from calendar to change its day. 2014-08-08 14:25:14 +02:00
Laurent Destailleur
75eb9cadc7 Merge pull request #1809 from KreizIT/fix_1549 
Fix :  [ bug #1549 ] It's not possible add ExtraFields
 2014-08-08 01:52:13 +02:00
Laurent Destailleur
ef23f6fc46 Merge pull request #1804 from GPCsolutions/typo 
Fixed typo
 2014-08-08 01:33:34 +02:00
KreizIT
c94c0699d8 Fix : [ bug #1549 ] Itïs not possible add ExtraFields 2014-08-06 17:38:44 +02:00
Laurent Destailleur
1751b58ef8 New: Can add __PROJECT_REF__ and __TIHRPARTY_NAME__ into email topic or 
content template.
 2014-08-06 00:46:00 +02:00
Raphaël Doursenaud
d09f4bed21 Fixed typo 2014-08-05 10:50:41 +02:00
Laurent Destailleur
164c9e0b75 New: Can defined a bcc for each email type. 2014-08-05 09:28:58 +02:00
Laurent Destailleur
50f18ff939 Merge pull request #1801 from fmarcet/develop 
Fix: Optimize Price by Customer
 2014-08-04 09:12:35 +02:00
Laurent Destailleur
7d3c266a1d Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/agenda_other.php
	htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
	htdocs/install/mysql/migration/repair.sql
 2014-08-04 00:02:00 +02:00
Laurent Destailleur
51f1577c84 Fix: Field for user into event is "owner". 2014-08-03 23:32:36 +02:00
fmarcet
67a7a210fd Fix: Optimieze Price by Customer 2014-08-01 16:17:31 +02:00
frederic34
5f80e9ed20 Update propal.php 
Correct typo
 2014-07-31 16:52:00 +02:00
frederic34
6d5767e464 Merge remote branch 'upstream/develop' into selectdelivery 2014-07-28 20:15:40 +02:00
frederic34
395b003266 Merge remote branch 'upstream/develop' into selectdelivery 
Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-07-28 17:10:07 +02:00
Laurent Léonard
0228cd9db7 Fix translations in e-mail forms 2014-07-28 02:45:58 +02:00
frederic34
0450498e2b Add restriction to combo box 2014-07-26 17:17:40 +02:00
Laurent Destailleur
234ba0ca1c Merge pull request #1770 from frederic34/patch-5 
Update propal.php
 2014-07-26 14:47:54 +02:00
frederic34
2df2c12cfd The delivery method is transmited in shipment 2014-07-25 21:50:21 +02:00
icfr
d61d4778fb erreur de frappe 2014-07-25 19:03:31 +02:00
frederic34
4fcff3e2e5 Select delivery method for order 2014-07-25 17:20:42 +02:00
frederic34
f0a7cc3268 Select Shipping Method in Propal 2014-07-24 18:08:08 +02:00
frederic34
add5328d8f Update propal.php 2014-07-24 18:07:22 +02:00
Laurent Destailleur
d7163fe543 Qual: Start to fight deprecated code use reported by 
https://scrutinizer-ci.com/g/eldy/dolibarr/issues/develop?orderField=path&order=asc
 2014-07-20 15:34:33 +02:00
Laurent Destailleur
bf926cd791 Merge pull request #1756 from marcosgdf/messages 
Migrated old message notifications to the """new""" system
 2014-07-20 04:57:09 +02:00
Marcos García de La Fuente
4f4ac30fc0 Deprecating arbitrary use of dol_htmloutput* functions 2014-07-20 02:32:13 +02:00
Marcos García de La Fuente
43597c1731 Migrated old error notifications to the """new""" system 2014-07-20 01:43:46 +02:00
Marcos García de La Fuente
ac824728bc Migrated old error notifications to the """new""" system 2014-07-20 01:09:43 +02:00
Marcos García de La Fuente
434bb1bec7 Migrated old message notifications to the """new""" system 2014-07-20 00:10:40 +02:00
Laurent Destailleur
d87e146e47 Fix: Navigation into agenda tabs 2014-07-19 22:37:18 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
Laurent Destailleur
728ca22183 Merge pull request #1730 from GPCsolutions/accessibility 
Accessibility
 2014-07-11 14:57:02 +02:00
Laurent Destailleur
4dfaf9ce38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-11 13:56:57 +02:00
Laurent Destailleur
d167fb4fcd Wok on page to show events per users. 2014-07-11 13:55:15 +02:00
Raphaël Doursenaud
f6848e8655 Add label on search boxes 2014-07-11 13:26:02 +02:00
Laurent Destailleur
5e75dd27e8 Merge pull request #1719 from frederic34/selectbank 
Select bank account for propal order and invoice
 2014-07-11 12:29:21 +02:00
Laurent Destailleur
5c81074483 Merge pull request #1709 from KreizIT/review_trig2 
Review trig2
 2014-07-11 12:27:43 +02:00
frederic34
387d36e4b0 Ste bank account for supplier order 2014-07-09 18:00:21 +02:00
frederic34
c8e6387e52 Merge remote branch 'upstream/develop' into selectbank 
Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-07-08 22:46:38 +02:00
Laurent Destailleur
90a5f6c7ef Qual: Remove end php tag. 2014-07-08 01:02:30 +02:00
frederic34
0cb5220d4d Use english for the function name 2014-07-07 20:54:41 +02:00
frederic34
9949713d20 Some cleaning 2014-07-07 18:40:18 +02:00
frederic34
f29eeceb1a Select bank account for propal and order 2014-07-06 20:49:34 +02:00
Juanjo Menent
8e4e08f907 [ task #1063 ] Allow edit localtaxes rate for thirds. Improve visu 2014-07-04 16:48:42 +02:00
KreizIT
fc6382ea7e Fix: [ bug #1463, #1464 ] Proposal triggers problem 2014-07-04 15:15:36 +02:00
Laurent Destailleur
62832167a0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-04 13:45:07 +02:00
Laurent Destailleur
be4fe3d0d0 Merge branch 'syslog' of github.com:marcosgdf/dolibarr into 
marcosgdf-syslog

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/projet/class/project.class.php
	htdocs/projet/class/task.class.php
 2014-07-04 13:43:50 +02:00
Juanjo Menent
466086dca3 [ task #1063 ] Allow edit localtaxes rate for thirds. Remove country 
condition
 2014-07-04 13:37:25 +02:00
Laurent Destailleur
8c306a968f Merge pull request #1704 from KreizIT/review_trig 
Review user trigger
 2014-07-04 13:20:32 +02:00
Juanjo Menent
11c1bdecdf [ task #1063 ] Allow edit localtaxes rate for thirds. Works with propals 2014-07-04 11:07:10 +02:00
Juanjo Menent
811ac6701a [ task #1063 ] Allow edit localtaxes rate for thirds. Works with propals 2014-07-04 11:02:41 +02:00
KreizIT
538cf90f5e FIX : [ bug #1496 ] ACTION_DELETE trigger does not show trigger error 
-Add ACTION_* trigger in interface_90_all
 2014-07-03 15:39:40 +02:00
Marcos García de La Fuente
460fb7a453 Removed new SQL double-debug 2014-07-02 21:29:07 +02:00
Marcos García de La Fuente
7e1cf124b8 Merge branch 'develop' into syslog 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/lib/replenishment.lib.php
	htdocs/societe/soc.php
 2014-07-02 21:20:02 +02:00
Laurent Destailleur
31c27b8f7c New: More option to define default filter setting of agenda views. 2014-06-29 23:35:00 +02:00
Florian HENRY
1857280234 Fix [ bug #1516 ] PRODUIT_CUSTOMER_PRICES don't take default price if 
not defined for customer
 2014-06-29 17:39:54 +02:00
Laurent Destailleur
faeeca533b Fix: sql error 2014-06-29 04:34:12 +02:00
Laurent Destailleur
330c965cb9 New: Add hook "searchAgendaFrom". 2014-06-29 02:45:55 +02:00
Laurent Destailleur
567280e85d Fix: Too much br 2014-06-28 21:17:27 +02:00
Laurent Destailleur
6916d251b5 New: Can filter events on a group of users. 2014-06-28 20:49:10 +02:00
Laurent Destailleur
03c6d8fdc3 New: Can create proposal from an intervention. 2014-06-28 19:47:51 +02:00
Laurent Destailleur
a8e4391887 Prepare calendars to be able to show calendars with selection on several 
users.
 2014-06-28 18:04:32 +02:00
Laurent Destailleur
e5a06635dc Fix css for agenda box 
Make different view of agenda into different tabs.
 2014-06-27 20:50:46 +02:00
Laurent Destailleur
79dec7ad90 Merge pull request #1641 from defrance69/patch-17 
Patch 17
 2014-06-26 21:43:45 +02:00
Laurent Destailleur
a79aa1f203 Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop 
Conflicts:
	htdocs/product/class/product.class.php
 2014-06-26 21:38:03 +02:00
Laurent Destailleur
2deadea40a New: Filter on event status 2014-06-26 20:24:00 +02:00
Laurent Destailleur
75d9e950c2 Fix: Another column visible when it shouldn't (field has been removed 
and is no more updated by dolibarr).
 2014-06-23 10:10:18 +02:00
Laurent Destailleur
39eea995a4 Merge pull request #1675 from FHenry/3.5 
Fix == instaed of = in variable affectation
 2014-06-20 16:52:44 +02:00
Laurent Destailleur
8d1fdec8cf Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/fiche.php
	htdocs/projet/fiche.php
 2014-06-20 15:26:02 +02:00
Florian HENRY
d09ccf5855 Fix == instaed of = in variable affectation 2014-06-20 13:21:49 +02:00
Laurent Destailleur
e7f08c6d37 Merge pull request #1674 from atm-maxime/3.5 
Fix 1462, 1468, 1480, 1483, 1490, 1497 $this instead of $object (3.5 fix...
 2014-06-20 13:20:50 +02:00
Maxime Kohlhaas
aaabf9647d Fix 1462, 1468, 1480, 1483, 1490, 1497 $this instead of $object (3.5 fix) 2014-06-20 09:33:25 +02:00
Florian HENRY
0645189432 If multiprice level is used the VAT on addline is not correct 2014-06-18 10:56:38 +02:00
Florian HENRY
9bb537f399 - New: If multilangue is enabled, mail (from propal, invoice, etc...) 
message is pre-defaulted in Customer language
 2014-06-18 09:59:15 +02:00
Florian HENRY
df9f153142 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
 2014-06-17 12:01:45 +02:00
Maxime Kohlhaas
bada082b2b Fix 1462, 1468 $this instead of $object 2014-06-14 12:02:07 +02:00
Marcos García de La Fuente
56abf1cd72 Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
ca0a6cb307 Removed SQL string from call debug log 2014-06-13 01:34:39 +02:00
Laurent Destailleur
2edfcc2583 Fix: ref was not set on object after renamed 2014-06-12 15:56:38 +02:00
Laurent Destailleur
1ba02185e5 Fix: Error nor reported 2014-06-12 15:32:25 +02:00
Marcos García de La Fuente
7e7958cf73 Removed SQL errors as they are logged by the database handler 2014-06-12 13:49:05 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Laurent Destailleur
8a9db28e09 Fix: Use correct name of field. 2014-06-10 08:50:49 +02:00
Laurent Destailleur
3bcb4712c0 Fix: Field must be reset after adding a new line 2014-06-10 08:49:01 +02:00
Marcos García de La Fuente
ae4bd4445e Moved dol_syslog query log to the database handler and decreased report level to DEBUG 2014-06-09 15:49:54 +02:00
Francis Appels
1460a0b0f1 fix: remise_client history 2014-06-08 12:36:44 +02:00
BENKE Charles
d0bab2f7e2 Update propal.class.php 
research additionnal models numbering in additional modules folders
 2014-06-06 12:29:20 +02:00
Laurent Destailleur
e1fc9bee6b Fix: Removed deprecated test 2014-05-30 13:41:58 +02:00
Florian HENRY
0de66e838c camel case 2014-05-30 12:01:26 +02:00
Laurent Destailleur
14d76d9229 Merge pull request #1632 from nicolasb827/patch-1 
Patch, missing product_type (or reset) on propal update line
 2014-05-30 11:31:36 +02:00
Laurent Destailleur
ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
 2014-05-29 19:20:48 +02:00
Florian HENRY
d304c7785e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/modules/mailings/pomme.modules.php
 2014-05-29 14:28:01 +02:00
Florian HENRY
c19eabf711 Better target emailing status mangement 2014-05-29 14:26:27 +02:00
nicolasb827
c3ebece1ef fix update SQL request 2014-05-28 01:25:36 +02:00
nicolasb827
83aba41c6c copy type on line update 2014-05-28 01:18:31 +02:00
nicolasb827
c091009afb fetch product_type field from DB 
When loading propal line on edit, product_type is reset to 0
 2014-05-28 01:07:27 +02:00
Laurent Destailleur
33ef8595dc Fix: Bad alignement 2014-05-27 10:19:34 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again) 
These were reintroduced by careless merge
 2014-05-26 13:51:25 +02:00
Laurent Destailleur
b11ef37c58 Fix: Bad balance of table 2014-05-24 12:59:44 +02:00
Laurent Destailleur
1df758320d Fix: the delivery date must not be set with date of proposal. 2014-05-24 12:55:39 +02:00
Laurent Destailleur
f34aadef3d Fix: css 2014-05-23 21:06:53 +02:00
Laurent Destailleur
23e951ff2a Fix: select_date accepts -1 or '' but not 0 2014-05-23 20:54:23 +02:00
Laurent Destailleur
43bf9ba890 Fix: Import of ical files was broken 
Fix: Can import of ical files from BlueMind.
 2014-05-23 04:28:57 +02:00
Laurent Destailleur
94335b186e Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/modules/propale/mod_propale_marbre.php
 2014-05-21 20:30:07 +02:00
Florian HENRY
5a5c858578 [ bug #1399 ] [pgsql] Silent warning when setting a propal as 
"facturée" in propal.php
 2014-05-19 16:21:59 +02:00
Laurent Destailleur
e09cc127fd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-19 15:10:46 +02:00
Laurent Destailleur
b7f55ea99c Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/liste.php
 2014-05-18 11:52:52 +02:00
Laurent Destailleur
eec5d6d313 Fix: Error management of mass email feature 2014-05-17 19:02:47 +02:00
Laurent Destailleur
b3b7da8f08 Merge pull request #1595 from FHenry/develop 
Add showempty into combobox
 2014-05-14 11:46:35 +02:00
Florian HENRY
fb277bbbab fix llx_societe.datea call in request 2014-05-13 19:32:04 +02:00
Laurent Destailleur
f621f7eb32 Fix: The rounding mode is now forced when provided explicitly and no 
more by default (we keep data intact when no mode provided).
 2014-05-13 13:22:29 +02:00
Laurent Destailleur
69eaefc459 Fix: The way we tested if a ref/id already exists was wrong. Introduce a 
common static method for this. Removed verifNumRef method.
Fix: Add missing logs
 2014-05-13 10:12:45 +02:00
Laurent Destailleur
64f8dcf131 Fix: Bad syntax of vars 2014-05-12 12:10:52 +02:00
Alexis Algoud
f13c146908 Fix page numerotation as in company list 2014-05-12 11:00:58 +02:00
Laurent Destailleur
f95c87f1d6 Fix: [ bug #1374 ] Salaries module requires "Special costs" module to 
work but it does not enable it
 2014-05-10 18:57:04 +02:00
Florian HENRY
50a6cac094 Add hook on comm/fiche.php to manage doAction and buttons 2014-05-07 17:23:38 +02:00
Laurent Destailleur
131f133e07 New: Merge free product and predefined product area to enter new 
product (Supplier orders now use same template than customer
orders/proposal/invoices).
 2014-05-05 17:59:43 +02:00
Laurent Destailleur
d224128c46 New: Merge free product and predefined product area to enter new 
product.
 2014-05-05 14:30:08 +02:00
Laurent Destailleur
27b12df103 Fix: CRLF 2014-05-04 21:19:24 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
fc9c491d15 New: Add constant to set label for level prices. 2014-05-01 12:19:24 +02:00
Laurent Destailleur
569d4cfd41 Merge pull request #1556 from FHenry/develop 
Enable option clone target emailing
 2014-05-01 11:08:05 +02:00
Laurent Destailleur
880f77b7e1 Fix: Preview feature 2014-04-30 13:50:25 +02:00
Laurent Destailleur
19d71ffb38 Prepare fix to hide images generated by "preview" feature. 2014-04-29 21:14:55 +02:00
Florian HENRY
7a46bdfc55 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2014-04-28 17:20:40 +02:00
Florian HENRY
dddbc37d35 Enable option clone target emailing 2014-04-28 17:18:11 +02:00
Laurent Destailleur
4cb671f4db Qual: Clean deprecated code. 2014-04-28 11:55:08 +02:00
Laurent Destailleur
693529c40b Merge pull request #1549 from atm-maxime/develop 
Fix : proposal validation was converting third as customer
 2014-04-23 21:18:34 +02:00
Maxime Kohlhaas
d21ea0fe19 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-04-23 17:51:22 +02:00
Maxime Kohlhaas
b9865b9ccc Fix : proposal validation was converting third as customer 2014-04-23 17:50:47 +02:00
BENKE Charles
ad9efb3961 Update propal.class.php 
it's this->lines who used on create propal function not this->products
 2014-04-21 15:40:08 +02:00
Laurent Destailleur
41a2ce1a74 Fix: [ bug #1319 ] Erreur d'affichage des remises dans les propales 
Conflicts:
	htdocs/comm/propal.php
 2014-04-06 21:21:08 +02:00
Laurent Destailleur
a2531872cb Fix: [ bug #1319 ] Erreur d'affichage des remises dans les propales 2014-04-06 21:17:35 +02:00
Laurent Destailleur
9a8a306d78 Qual: Method form->select_currency() has been removed. Use instead 
print form->selectCurrency().
Qual: Method form->select_methodes_commande() has been renamed into
english name selectInputMethod().
 2014-04-02 14:53:42 +02:00
Laurent Destailleur
3a2caa6e64 New: Can filter on status for supplier order. 2014-04-02 12:48:34 +02:00
Laurent Destailleur
7ac193bb80 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/opensurvey/public/choix_autre.php
 2014-04-02 11:41:55 +02:00
Laurent Destailleur
46e46507ec Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/compta/bank/class/account.class.php
	htdocs/compta/bank/index.php
 2014-04-02 11:33:47 +02:00
BENKE Charles
f1d9cebb93 Update propal.class.php 
refactoring LibStatut function (small is better)
 2014-03-31 02:38:07 +02:00
Laurent Destailleur
b675b9b610 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/fourn/facture/fiche.php
	htdocs/langs/en_US/admin.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/projet/tasks/task.php
 2014-03-31 00:44:45 +02:00
Laurent Destailleur
f282ffc549 Merge pull request #1508 from KreizIT/3.5 
FIX :[bug #1309]
 2014-03-27 15:58:13 +01:00
Florian Henry
3d12979b3f remove debug string 2014-03-26 09:53:48 +01:00
Cedric
57cf384617 Keep value on validtions failure 2014-03-25 13:05:29 +01:00
Cedric
e16385b496 FIX :[bug #1309] 2014-03-25 11:48:44 +01:00
Marcos García de La Fuente
c8c77dbdcf Fix: Agenda and Banks module were not working with multicompany module 2014-03-22 18:59:48 +01:00
Laurent Destailleur
cafa61ef7d Fix: Use correct syntax of date into sql requests (with quotes) 2014-03-15 23:12:00 +01:00
jfefe
f648f85b61 Remove debug infos into agenda index 2014-03-15 15:44:02 +01:00
bouna
e7791a3ade Update list.php 
to save the town filtre on prospect list, just i replace: 
$param='&amp;stcomm='.$stcomm.'&amp;search_nom='.urlencode($search_nom).'&amp;search_zipcode='.urlencode($search_zipcode).'&amp;search_ville ='.urlencode($search_ville );

search_ville by search_town
 2014-03-14 19:46:36 +01:00
Laurent Destailleur
1b85f83dbb Merge pull request #1466 from marcosgdf/minor 
Minor style and translation corrections
 2014-03-13 11:53:52 +01:00
Laurent Destailleur
bdb2b7a547 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/projet/index.php
	test/phpunit/FunctionsTest.php
 2014-03-13 09:20:05 +01:00
Marcos García de La Fuente
8bc273298e Corrected proposals extrafield admin page translation 2014-03-11 12:38:11 +01:00
Laurent Destailleur
86ad05c22e Merge pull request #1461 from marcosgdf/unknown-error 
Corrected Unknown error message typo
 2014-03-11 11:54:08 +01:00
Marcos García de La Fuente
fa56fe4e8b Corrected Unknown error message typo 2014-03-10 19:36:32 +01:00
Laurent Destailleur
6a3323d6d1 Fix: Readonly mode does not need to use a specific toolbar with ckeditor 
4.
 2014-03-08 13:46:17 +01:00
Laurent Destailleur
0283c16a47 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-03-06 18:27:09 +01:00
Laurent Destailleur
b762c66c8a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-03-06 18:04:19 +01:00
Laurent Destailleur
270eaf7aca Qual: Uniformize search date for lists. 2014-03-06 17:02:27 +01:00
philippe
e2b29bb108 fix english misspelling 2014-03-05 09:57:36 +01:00
Laurent Destailleur
24b0ea6613 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-03-03 19:38:02 +01:00
Laurent Destailleur
7db903e671 Fix: special code was lost during update 2014-03-01 16:58:10 +01:00
Laurent Destailleur
45898a989c Fix: Translation done twice 2014-03-01 10:16:03 +01:00
simnandez
afebf86bf1 Fix: Loading actions extrafields fails. 
Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-26 16:55:42 +01:00
simnandez
8ffa11fe16 Fix: Loading actions extrafields fails. 2014-02-26 16:50:38 +01:00
Laurent Destailleur
480b09f192 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/societe/class/societe.class.php
 2014-02-26 15:49:29 +01:00
Laurent Destailleur
e8cadf3a3e New: Add form search customer order on commercial main page. 2014-02-25 18:33:04 +01:00
Laurent Destailleur
b1eef7cd42 Fix: [ bug #1254 ] Error when using "Enter" on qty input box of a 
product
 2014-02-24 17:37:35 +01:00
Florian Henry
ec8ad9f8bb codesniffer 2014-02-23 20:10:05 +01:00
Florian Henry
d242f4930d php codesniffer 2014-02-23 17:01:51 +01:00
Florian Henry
720746b1b2 Fix php sniffer 2014-02-23 16:29:16 +01:00
Florian Henry
46ae5d6e9c - New: Price management enhancement (multiprice level, price by 
customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
- Fix: Project Task numbering rule customs rule works
 2014-02-23 16:16:47 +01:00
Laurent Destailleur
6f962397e4 Start to work on a mass send remind feature. 2014-02-19 20:23:02 +01:00
Laurent Destailleur
860ca15cfc Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2014-02-17 15:27:30 +01:00
Laurent Destailleur
abc96b51fa Enable extrafields for customer order, proposal and invoice lines. This 
feature was developed for 3.5 but was disabled (hidden) because of
a bug not possible to fix enough quickly for 3.5.0 release.
 2014-02-16 23:51:29 +01:00
Laurent Destailleur
908c39098d Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-16 19:47:51 +01:00
Laurent Destailleur
4b8d39af9d Fix: Do not report trigger errors twice. 
Fix: Error when creating event was not reported.

Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-14 13:05:04 +01:00
Laurent Destailleur
3e3c541e4c Fix: Do not report trigger errors twice. 
Fix: Error when creating event was not reported.
 2014-02-14 12:54:04 +01:00
Laurent Destailleur
634c5b64f1 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/product/fiche.php
 2014-02-12 00:25:08 +01:00
Laurent Destailleur
4869b95601 Fix: Default size too long making screen hang. 2014-02-12 00:01:22 +01:00
Laurent Destailleur
213a64edcc Fix for missing param. 2014-02-10 01:36:15 +01:00
Laurent Destailleur
46e9b5d550 Merge branch 'develop' of https://github.com/grandoc/dolibarr into 
grandoc-develop

Conflicts:
	htdocs/langs/ar_SA/admin.lang
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/tr_TR/admin.lang
 2014-02-10 01:30:48 +01:00
Laurent Destailleur
ce8d13ead0 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/comm/action/fiche.php
	htdocs/filefunc.inc.php
	htdocs/install/check.php
 2014-02-10 00:38:10 +01:00
Laurent Destailleur
b750e98d40 Fix: Pb of file upload and download. 2014-02-08 02:02:01 +01:00
Gregory DAVID
3a053e3fed Donne la possibilité de faire un filtrage sur les agenda en fonction du numéro de projet passé en GET : &project=XX 2014-02-07 18:08:25 +01:00
Laurent Destailleur
e1880a6394 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-02-06 20:57:58 +01:00
Laurent Destailleur
43970b3bd6 Removed some TODO 2014-02-06 20:45:50 +01:00
Laurent Destailleur
d1951393c7 Fix: priority is a field smallint. 
Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-06 17:09:41 +01:00
Laurent Destailleur
9166dc2d8c Fix: priority is a field smallint. 2014-02-06 16:57:45 +01:00
Laurent Destailleur
d8b8f8c646 Uniformize code for contacts forms. 2014-02-04 20:49:07 +01:00
Laurent Destailleur
9aaafde6d5 Fix: Pb with cache files for graphical boxes: 
Missing year into cache id.
User with restrcited permission on thirdparty must not share same cache
files that "see all" users.
 2014-01-31 18:48:57 +01:00
Laurent Destailleur
1b88ab2355 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/contact/class/contact.class.php
 2014-01-31 10:12:41 +01:00
Laurent Destailleur
d6c4fa5fe3 Qual: Normalize code 2014-01-30 00:40:00 +01:00
Laurent Destailleur
5657bd7793 New: Can create contract from an order. 2014-01-28 15:26:20 +01:00
Laurent Destailleur
f83b47be9f Fix: Missing loading lang files. 2014-01-26 18:43:30 +01:00
Laurent Destailleur
8d916215cc New: Add new hook function addMoreActionsButtons to allow a module to 
add/replace action buttons into an element.
 2014-01-24 12:51:01 +01:00
Laurent Destailleur
bdbbb580f8 Merge pull request #1381 from altairis-fr/clonepropal 
clone of propal improvements
 2014-01-24 01:33:15 -08:00
Laurent Destailleur
bb1575e0e6 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-24 10:20:03 +01:00
Laurent Destailleur
9341db3e86 Fix: Missing id 2014-01-22 03:20:18 +01:00
Christophe Battarel
81bae5fff9 fix wrong constant usage 2014-01-21 18:33:25 +01:00
Laurent Destailleur
8d8e016115 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-20 02:42:37 +01:00
Laurent Destailleur
0d18892506 Merge from 3.4 2014-01-20 02:21:30 +01:00
Laurent Destailleur
699a079ed7 New: Add option MAIN_AUTO_TIMESTAMP_IN_PUBLIC_NOTES and 
MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES to automatically add
timestamp and user line into editionf field when editing a note.
 2014-01-20 00:31:32 +01:00
Laurent Destailleur
1fd67807ce Merge remote-tracking branch 'origin/3.5' into develop 2014-01-18 01:13:29 +01:00
Christophe Battarel
7d04944ca7 don't reset ref_client if same customer and MAIN_KEEP_REF_CUSTOMER_ON_CLONING 2014-01-16 11:48:48 +01:00
Christophe Battarel
687fc1798b on clone of propal, copy contact informations 2014-01-16 11:43:59 +01:00
Laurent Destailleur
fce9baddf0 New: Add substitution key into emailing module to include securitykey 
used for paypal links into email.
 2014-01-15 17:21:13 +01:00
Grand Philippe
462f65614d Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 2014-01-13 10:10:17 +01:00
Grand Philippe
c5689b86b4 Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 2014-01-13 09:43:21 +01:00
Laurent Destailleur
23eb0f3770 Qual: Mutualize code for actions of editing notes 
New: Add button 'cancel' to cancel edition of a note (private or public)
 2014-01-11 13:33:30 +01:00