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

38733 Commits

Author SHA1 Message Date
Laurent Destailleur
68441a563a Fixed: Avoid space into address string 2015-01-14 19:17:58 +01:00
Laurent Destailleur
4c64b8ceae Add menu image 2015-01-14 19:12:22 +01:00
Laurent Destailleur
e3f3956bed Sec: Bad security test 2015-01-14 19:11:56 +01:00
Laurent Destailleur
806477977d Fix: css 2015-01-14 13:51:21 +01:00
Laurent Destailleur
a886136e67 More comment and add a unit test to check that {t} tag is correctly 
supported.
 2015-01-13 22:13:15 +01:00
Marcos García de La Fuente
4da52cf733 Fix: [ bug #1797 ] Tulip Supplier invoice module takes creation date instead of invoice date 2015-01-13 11:11:37 +01:00
Marcos García de La Fuente
7b4cf976df Corrected translation typos 2015-01-13 09:42:46 +01:00
Marcos García de La Fuente
85b1188593 Fix: [ bug #1788 ] Duplicated doActions hook in product/fournisseurs.php 2015-01-13 09:22:12 +01:00
Marcos García de La Fuente
6c4702f282 Fix: [ bug #1785 ] Start date is lost in Project > Linked objects 2015-01-13 09:11:04 +01:00
Marcos García de La Fuente
7e16d0c1d3 Fix: [ bug #1792 ] Users are not allowed to see margins module index page when no product view permission is enabled 2015-01-13 01:48:58 +01:00
Laurent Destailleur
dc0d12eccd Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-12 19:00:29 +01:00
Laurent Destailleur
58e4e01db7 Sync transifex 2015-01-12 18:59:46 +01:00
Laurent Destailleur
31fd03790e Fixed: Prices visible into stock tab. 
Conflicts:
	htdocs/product/stock/product.php
 2015-01-12 18:26:11 +01:00
Cedric
d2cd841573 Fix divide by zero error 2015-01-12 13:23:18 +01:00
Cedric
26cad2400e Fix missing lang key 2015-01-12 13:18:50 +01:00
BENKE Charles
b6b84e235c Update card.php 
hide line with empty duration if FICHINTER_HIDE_EMPTY_DURATION is activate
 2015-01-12 10:16:34 +01:00
Laurent Destailleur
a77a604082 Fix: include custom dir so everybody has it. 2015-01-11 15:32:11 +01:00
Laurent Destailleur
e4b89779f7 Fixed: css conflict 2015-01-10 21:39:40 +01:00
Laurent Destailleur
c441aa89db Fixed: Avoid warning 2015-01-10 18:19:44 +01:00
Laurent Destailleur
90add2fa96 Fix: amarok is a bugged theme making dolidroid failed. We swith to 
eldy automatically with dolidroid.
 2015-01-10 17:23:52 +01:00
Laurent Destailleur
dda12003d4 Fixed: User of creation was not visible. 2015-01-10 12:23:15 +01:00
Laurent Destailleur
30d1284379 Fixed: Missing ref_ext 2015-01-10 01:15:39 +01:00
Laurent Destailleur
87f70f2d22 Fixed: property must be called billed into web service. 
Fixed: web service to create order was useless. it was not possible to
change status.
 2015-01-10 01:07:18 +01:00
Laurent Destailleur
f7960ec104 Fixed: Upgrade are done several times 2015-01-09 23:19:18 +01:00
fentman
9049931ff0 Change to $listofcurrenciesbefore for GBP + AUD 
Update of functions.lib.php - function price()
$listofcurrenciesbefore to include USD, GBP, and AUD to support $ and £ appearing before amounts on invoices not after the amount
 2015-01-09 22:55:17 +01:00
Laurent Destailleur
dbcaeb01c0 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/commande/class/commande.class.php
	htdocs/filefunc.inc.php
 2015-01-09 22:40:45 +01:00
Laurent Destailleur
32edb33411 Start 3.6.3 2015-01-09 22:32:25 +01:00
Laurent Destailleur
068ae7f0d4 - Fix: ref_ext was not saved when recording a customer order from web 
service
 2015-01-09 22:32:00 +01:00
Laurent Destailleur
f54e90c9cf Better doc to install external modules. 
Custom dir will be installed by default.
 2015-01-09 13:00:10 +01:00
Laurent Destailleur
b220bb7b1d Fixed: Size too low 2015-01-07 11:14:51 +01:00
Laurent Destailleur
f8792bdbc7 Fixed: Add opensurvey into list of reloaded modules for 3.7 2015-01-07 11:11:40 +01:00
Laurent Destailleur
4ee308c77b Fixed: Filter lost after search on date 2015-01-06 20:58:23 +01:00
Laurent Destailleur
2bf2c8fce7 Restore all requets 2015-01-06 00:34: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
4ce7a27dca Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-01-06 00:28:07 +01:00
Laurent Destailleur
a668d163fd Repair corrupted data 2015-01-06 00:27:35 +01:00
Laurent Destailleur
b919318b53 Merge pull request #2213 from marcosgdf/opensurvey 
Fixed error deleting survey comment
 2015-01-06 00:21:32 +01:00
Laurent Destailleur
443c9d245e Merge pull request #2212 from marcosgdf/misc-doc 
Miscellaneous corrections
 2015-01-06 00:21:05 +01:00
Laurent Destailleur
908a95d83f Merge pull request #2211 from marcosgdf/contract-fixes 
Several Contract-related fixes
 2015-01-06 00:18:51 +01:00
Laurent Destailleur
3f7aab93e5 Merge pull request #2204 from defrance69/patch-39 
Update facture.php
 2015-01-06 00:14:42 +01:00
Laurent Destailleur
e5f81b1fec Merge pull request #2202 from defrance69/patch-38 
Update facture.php
 2015-01-06 00:13:55 +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
Laurent Destailleur
561ace5b0c Merge pull request #2219 from ndrosis/patch-11 
Fix Lang for Check Payment Type
 2015-01-06 00:07:38 +01:00
Laurent Destailleur
6a6c5c54f1 Merge pull request #2220 from aspangaro/3.7-Auguria 
Add module accountancy expert in auguria menu
 2015-01-06 00:07:26 +01:00
Laurent Destailleur
256cd68404 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-06 00:04:51 +01:00
Laurent Destailleur
3794c9305e Fix: [ bug #1754 ] Error while installing 3.7 2015-01-06 00:04:23 +01:00
Laurent Destailleur
5032f88e9f Merge pull request #2221 from aspangaro/3.7-Skype 
Skype :: Better presentation
 2015-01-05 23:52:28 +01:00
aspangaro
b4b5b35afa Skype :: Better presentation 2015-01-04 20:17:49 +01:00
Laurent Destailleur
d8d01090cd Fixed: Mark function as deprecated 2015-01-04 19:28:05 +01:00
Laurent Destailleur
48818ed2fd Fixed: Quick solution to solve problem of unknown payment amount for 
online subscription.
 2015-01-04 15:40:01 +01:00
Laurent Destailleur
df3987fa10 Fixed: Bad url link with jquery mobile. We must add rel="external" on 
all external links.
 2015-01-04 14:51:16 +01:00
aspangaro
f14ea7b649 Add module accountancy expert in auguria menu 2015-01-03 15:07:54 +01:00
Drosis Nikos
68049a2f0e Fix Lang for Check Payment Type 2015-01-02 18:10:47 +02:00
Laurent Destailleur
be34fcfa8a Removed duplicate link making same thing 2014-12-30 21:33:56 +01:00
Laurent Destailleur
410c8e56c6 Better fix 2014-12-30 04:30:32 +01:00
Laurent Destailleur
3848daeab8 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
	htdocs/product/stats/facture.php
 2014-12-30 04:20:50 +01:00
Marcos García de La Fuente
a9a33479f1 Fixed error deleting survey comment 2014-12-29 03:44:03 +01:00
Marcos García de La Fuente
86100758ff Miscellaneous corrections 2014-12-28 20:13:15 +01:00
Marcos García de La Fuente
2202380bc2 Improving ContratLigne documentation 2014-12-28 19:36:43 +01:00
Marcos García de La Fuente
7424ee1107 Improving Contrat documentation and fixed some properties usage 2014-12-28 19:28:25 +01:00
Marcos García de La Fuente
ef4d710f78 Improving CommonObject and Contrat documentation 2014-12-28 19:16:14 +01:00
Marcos García de La Fuente
ec7bc21e4c Fixed undefined variable $pu_ht 2014-12-28 19:01:39 +01:00
Marcos García de La Fuente
0b4bddd738 Fix [ bug #1779 ] Undefined variable $localtaxtx1 and $localtaxtx2 in Contrat::updateline 2014-12-28 18:57:59 +01:00
Marcos García de La Fuente
7670ae46a6 Fix [ bug #1778 ] Cancel button of edit ref. supplier contract card saves changes instead of cancelling 2014-12-28 18:56:23 +01:00
Marcos García de La Fuente
de137dd012 Merge branch 'bug-1767' into bug-1774 2014-12-28 18:16:16 +01:00
Marcos García de La Fuente
1a827a87f3 Merge branch 'bug-1775' into bug-1774 2014-12-28 18:16:02 +01:00
Marcos García de La Fuente
df1f931ab8 Fixed: [ bug #1767 ] Contract document is not generated properly 2014-12-28 18:10:41 +01:00
Marcos García de La Fuente
52b8bb350e Fixed Contrat::fetch not setting Contrat::date_creation and improved class doc 2014-12-28 18:10:30 +01:00
Marcos García de La Fuente
cd468b65fd Documented Contrat class 2014-12-28 17:55:21 +01:00
Laurent Destailleur
e70b6714ce Doxygen 
(cherry picked from commit 613d1b3)
 2014-12-28 17:50:38 +01:00
Marcos García de La Fuente
584be6a589 Fixed Contrat::fetch 2014-12-28 17:47:13 +01:00
Marcos García de La Fuente
b9d6f2a496 Fix: [ bug #1775 ] New lines can be entered after contract validation 2014-12-28 17:43:25 +01:00
Marcos García de La Fuente
d4e7a97fdb Fix: [ bug #1774 ] PHP Fatal error when creating a contract with Product module not enabled 2014-12-28 17:31:27 +01:00
Marcos García de La Fuente
98ed747671 Fix: [ bug #1765 ] Unable to create a contract 2014-12-28 17:17:08 +01:00
Marcos García de La Fuente
f738863e51 Revert previous commit 2014-12-28 17:14:11 +01:00
Marcos García de La Fuente
1b693fae7f Merge branch '3.7' into bug-1765 2014-12-28 17:11:30 +01:00
BENKE Charles
2957c1445e Update facture.php 
$soc already filled upper if $socid filled
 2014-12-28 12:34:21 +01:00
BENKE Charles
191d4467e3 Update facture.php 
$soc already filled upper when $socid send
 2014-12-28 12:31:27 +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
c7937a9962 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-12-27 02:22:09 +01:00
Laurent Destailleur
953e736a97 Prepare version 3.6.2 2014-12-27 02:21:37 +01:00
Marcos García de La Fuente
95c7ba33ba Merge branch '3.7' into bug-1765 2014-12-26 12:10:38 +01:00
Marcos García de La Fuente
9f6f90275a Fix [ bug #1714 ] Id "sall" is used twice in different HTML tags 2014-12-26 12:03:29 +01:00
Juanjo Menent
bdf5f5726f Fix: Bad order field value 2014-12-26 09:29:27 +01:00
Juanjo Menent
d40229e9cc Fix: Bad order field value 2014-12-26 09:14:19 +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
75dbcf4a78 Fixed: doxygen 2014-12-26 04:35:48 +01:00
Laurent Destailleur
d18770c1e7 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-12-26 04:16:08 +01:00
Laurent Destailleur
0e952c67ff Merge pull request #2193 from marcosgdf/bug-1761 
Fix: [ bug #1761 ] SQL error when installing 3.7 with PostgreSQL
 2014-12-26 04:14:03 +01:00
Laurent Destailleur
77e48f8c3e Merge branch 'bug-1768' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1768 2014-12-26 04:12:58 +01:00
Laurent Destailleur
38c9d39c2b Merge branch 'bug-1757' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1757

Conflicts:
	ChangeLog
 2014-12-26 04:11:15 +01:00
Laurent Destailleur
4e2c321e4d Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-12-26 04:09:08 +01:00
Laurent Destailleur
0da1c2e589 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-12-26 04:06:10 +01:00
Laurent Destailleur
420ebe0be9 Fix: Change order to create fields 2014-12-26 04:04:16 +01:00
Laurent Destailleur
3c500158a9 Merge pull request #2187 from marcosgdf/bug-1715 
Fix [ bug #1715 ] Valign and width attributes are used in div tags
 2014-12-26 04:02:46 +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
469aba888a Merge pull request #2184 from marcosgdf/bug-1674 
Fix: [ bug #1674 ] PayPal logo copyright issues
 2014-12-26 03:52:34 +01:00
Laurent Destailleur
bba8653179 Merge pull request #2183 from marcosgdf/bug-1724 
Fix: [ bug #1724 ] Can't add a submenu to projects
 2014-12-26 03:50:36 +01:00
Laurent Destailleur
54437703fb Merge pull request #2177 from frederic34/patch-7 
Enhance select_salesrepresentatives with select2
 2014-12-26 03:49:43 +01:00
Laurent Destailleur
ade688b589 Merge pull request #2174 from marcosgdf/bug-1723 
Fix [ bug #1723 ] Draft tasks?
 2014-12-26 03:48:15 +01:00
Laurent Destailleur
b2d27a7d25 Merge pull request #2173 from marcosgdf/translation 
Fixed string not translated in linked objects of a project
 2014-12-26 03:47:56 +01:00
Laurent Destailleur
8d4186f438 Merge pull request #2172 from marcosgdf/bug-1533 
Fix: [ bug #1533 ] Links triggers do not show trigger error message
 2014-12-26 03:47:05 +01:00
Marcos García de La Fuente
745eece5fe Fix: [ bug #1761 ] SQL error when installing 3.7 with PostgreSQL 2014-12-26 00:34:57 +01:00
Marcos García de La Fuente
8e47fe9e1c Fix: [ bug #1757 ] Sorting breaks product/service statistics 2014-12-26 00:19:09 +01:00
Marcos García de La Fuente
1d39c1acc2 Fix: [ bug #1768 ] PHP Warning when error connecting to a PostgreSQL server in install script 2014-12-26 00:12:16 +01:00
Marcos García de La Fuente
f4def9ea28 Fix: [ bug #1769 ] Error when installing to a PostgreSQL DB that contains numbers 2014-12-26 00:07:24 +01:00
Laurent Destailleur
f3fded2a0a Merge pull request #2171 from marcosgdf/bug-1649 
Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same thing as modify
 2014-12-25 23:25:22 +01:00
Laurent Destailleur
224fa14e16 Merge branch 'bug-1731' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1731

Conflicts:
	ChangeLog
 2014-12-25 23:21:48 +01:00
Laurent Destailleur
33045668cd Merge pull request #2168 from frederic34/patch-5 
Translation error
 2014-12-25 23:19:42 +01:00
Laurent Destailleur
645bdec432 Merge pull request #2188 from marcosgdf/bug-1763 
Fixed [ bug #1763 ] Undefined variable $interface in Project:574
 2014-12-25 23:18:07 +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
5ec38d89ff Fixed [ bug #1763 ] Undefined variable $interface in Project:574 2014-12-25 22:59:57 +01:00
Marcos García de La Fuente
2616deb58d Copyright info 2014-12-25 22:52:11 +01:00
Marcos García de La Fuente
eb524cfd29 Copyright info 2014-12-25 22:50:33 +01:00
Marcos García de La Fuente
7b6a4d1bfd Fix: [ bug #1715 ] Valign and width attributes are used in div tags 2014-12-25 22:50:15 +01:00
Marcos García de La Fuente
ca133d74ac Corrected key not translated 2014-12-25 22:20:09 +01:00
Marcos García de La Fuente
da7dc2a393 Fix: [ bug #1765 ] Unable to create a contract 2014-12-25 22:02:22 +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
Marcos García de La Fuente
9d82e16506 Resized PayPal logo 2014-12-25 19:17:52 +01:00
Marcos García de La Fuente
f735aa676e Fix: [ bug #1674 ] PayPal logo copyright issues 2014-12-25 19:16:25 +01:00
Marcos García de La Fuente
146bba90e7 Fix: [ bug #1724 ] Can't add a submenu to projects 2014-12-25 18:42:26 +01:00
Marcos García de La Fuente
09a094104c Removed duplicated and unused translation key 2014-12-25 18:31:24 +01:00
Marcos García de La Fuente
c050fe2a27 Merge branch '3.6' into bug-1649 
Conflicts:
	ChangeLog
 2014-12-25 01:27:57 +01:00
Marcos García de La Fuente
1179f722af Merge branch '3.7' into bug-1533 2014-12-25 01:26:00 +01:00
Marcos García de La Fuente
82fa3a447b Merge branch '3.6' into translation 2014-12-25 01:18:58 +01:00
Juanjo Menent
f60d7ea2de Merge pull request #2176 from marcosgdf/bug-1722 
Fix: [ bug #1722 ] Missing link in homepage project's box
 2014-12-24 14:41:47 +01:00
Marcos García de La Fuente
b68276637b Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some 
masks

Conflicts:
	htdocs/core/lib/functions2.lib.php
 2014-12-24 14:31:17 +01:00
Laurent Destailleur
a111c4765c Fixed: Filter lost with navigation 2014-12-23 18:00:14 +01:00
Laurent Destailleur
b7dbb1e9cd Fixed: Do not show disabled user when creating a new event. 2014-12-23 17:46:30 +01:00
Frédéric FRANCE
d03cc03cd7 Enhance select_salesrepresentatives with select2 2014-12-23 16:42:05 +01:00
Marcos García de La Fuente
034455fc2d Fix: [ bug #1722 ] Missing link in homepage project's box 2014-12-23 16:37:53 +01:00
Marcos García de La Fuente
416f13c708 Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 00H 2014-12-23 16:00:04 +01:00
Marcos García de La Fuente
743867b91b Spanish translation 2014-12-23 15:57:30 +01:00
Marcos García de La Fuente
78307a748d Corrected confusing table header in task list 2014-12-23 15:56:29 +01:00
Marcos García de La Fuente
a90a03412a Fixed string not translated in linked objects of a project 2014-12-23 15:43:45 +01:00
Laurent Destailleur
2b4edd9996 Fix: [ bug #1687 ] The ref filter searches on ref and rowid in supplier 
invoices list
 2014-12-23 13:21:40 +01:00
Laurent Destailleur
aa618d481b Fixed: [ bug #1690 ] Sorting on salary table triggers SQL errors 2014-12-23 13:07:16 +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
Laurent Destailleur
e8addcb8ba Fixed: [ bug #1756 ] PHP error while removing an import profile 2014-12-23 12:25:21 +01:00
Marcos García de La Fuente
8a14409974 Fix: [ bug #1533 ] Links triggers do not show trigger error message 2014-12-23 11:39:43 +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
Marcos García de La Fuente
db30186386 Fix: [ bug #1731 ] Can't use quick navigation on project tasks secondary tabs 2014-12-22 22:52:43 +01:00
Marcos García de La Fuente
46fe2c67e0 Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks 2014-12-22 22:32:05 +01:00
Frédéric FRANCE
748bef6134 Translation error 2014-12-22 20:02:53 +01:00
Laurent Destailleur
51a26ea5a9 Merge pull request #2163 from frederic34/patch-1 
Typo on conf variable
 2014-12-22 09:52:46 +01:00
Laurent Destailleur
22a7123cd9 Merge pull request #2164 from frederic34/patch-5 
Admin config for ask for payment bank during order
 2014-12-22 09:52:08 +01:00
Laurent Destailleur
e6d2bc0bff Maj icon 2014-12-22 03:12:01 +01:00
Laurent Destailleur
1dc2bbb0f1 Fixed: Var no declared 2014-12-22 03:01:31 +01:00
Laurent Destailleur
46fdd19389 Update image for menu 2014-12-22 02:54:38 +01:00