Commit Graph

47328 Commits

Author SHA1 Message Date
Laurent Destailleur
4ee308c77b Fixed: Filter lost after search on date 2015-01-06 20:58:23 +01:00
Raphaël Doursenaud
50c2b75ef8 Invoices: added situation (or interim) invoices support 2015-01-06 17:12:13 +01:00
KreizIT
ce3a60b2a3 Allow warehouse transfer for batched product 2015-01-06 13:23:51 +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
f7dd4a1357 Merge pull request #2222 from KreizIT/batch_improvement
Fix / Improve : [ bug #1747 ] Remove creation of batch 'Undefined'
2015-01-06 00:26:22 +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
ce1cad2801 Merge pull request #2207 from frederic34/patch-3
Enhance select_categories with select2
2015-01-06 00:17:43 +01:00
Laurent Destailleur
6ca90ffdad Merge pull request #2206 from defrance69/patch-41
Update card.php
2015-01-06 00:17:12 +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
28fe8061c4 Merge pull request #2201 from IonAgorria/project-year-filter
Project searching by year
2015-01-06 00:13:37 +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
2ef9b4def6 Merge pull request #2198 from frederic34/patch-7
Typo
2015-01-06 00:08:41 +01:00
Laurent Destailleur
6916fffbe2 Merge pull request #2197 from frederic34/patch-5
Attribut width not allowed with div or span
2015-01-06 00:08: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
38be767a7c Merge pull request #2216 from frederic34/patch-10
Update cidlookup.php
2015-01-06 00:06:17 +01:00
Laurent Destailleur
d98f3937c8 Merge pull request #2217 from grandoc/develop
better translation and typo
2015-01-06 00:05:53 +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
e9a9ade30f Merge pull request #2218 from ndrosis/patch-12
Fix Lang for cashdesk Check Payment Type
2015-01-05 23:52:48 +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
KreizIT
a7fc2b3779 Fix / Improve : [ bug #1747 ] Remove creation of batch 'Undefined' 2015-01-05 17:55:59 +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
c0b5b9f00b Fixed: Removed deprecated function 2015-01-04 19:26:51 +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
a5572eb200 Fix Lang for cashdesk Check Payment Type 2015-01-02 18:15:14 +02:00
Drosis Nikos
68049a2f0e Fix Lang for Check Payment Type 2015-01-02 18:10:47 +02:00
philippe grand
96e6c66365 better translation and typo 2015-01-01 11:24:00 +01:00
Laurent Destailleur
be34fcfa8a Removed duplicate link making same thing 2014-12-30 21:33:56 +01:00
Laurent Destailleur
baa247ea86 Fixed: doxygen 2014-12-30 21:24:57 +01:00
Laurent Destailleur
d72d056e02 Enhance look for contacts forms of thirdparties. 2014-12-30 21:04:02 +01:00
Frédéric FRANCE
ddcd086ada Update cidlookup.php 2014-12-30 18:11:55 +01:00
Frédéric FRANCE
15c98ff2e1 Update cidlookup.php 2014-12-30 17:59:40 +01:00
Laurent Destailleur
410c8e56c6 Better fix 2014-12-30 04:30:32 +01:00
Laurent Destailleur
8abbac564b Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/main.inc.php
2014-12-30 04:28:09 +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