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

34392 Commits

Author SHA1 Message Date
Marcos García
290b810bb8 Little refactor in product/liste.php 2013-12-15 18:49:55 +01:00
Marcos García
d65374bb02 Fixed bug #1196: Product barcode search does not expect 13th digit on EAN13 type 
Some code written by "hipnosapo" forum user in http://www.dolibarr.es/index.php/foro/7-bugs-versiones-estables/3891-ean13-buscador-codigo-barras-13-digitos#3891
 2013-12-15 18:44:53 +01:00
Laurent Destailleur
3c87e1e20d Fix: no required class for not mandatory fields 2013-12-15 18:11:56 +01:00
Laurent Destailleur
ef2f8ea67d Removed some FIXME 2013-12-15 14:26:27 +01:00
Laurent Destailleur
bba2892752 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/commande/liste.php
 2013-12-15 02:02:24 +01:00
Laurent Destailleur
dc754bbdc2 Fix: Trigger name conflicts and reference file was not matching real 
name of triggers.
 2013-12-14 20:48:34 +01:00
Laurent Destailleur
0e25939373 Fix: price function not correctly used 2013-12-14 17:40:23 +01:00
Laurent Destailleur
db9ef992eb Fix: Clean var 2013-12-14 17:25:57 +01:00
Laurent Destailleur
648bf73bac Fix: [ bug #1179 ] Wrong warnings on commande/liste.php / delivery date 
should be checked

Conflicts:
	htdocs/commande/liste.php
 2013-12-14 15:49:08 +01:00
Laurent Destailleur
ed40e6d9b0 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/comm/prospect/list.php
	htdocs/langs/en_US/bills.lang
 2013-12-14 15:44:10 +01:00
Laurent Destailleur
dc1ccbfae8 Fix: [ bug #1177 ] Error on create domiciliation 2013-12-14 15:40:43 +01:00
Laurent Destailleur
4248431dc9 Fix: [ bug #1177 ] Error on create domiciliation 2013-12-14 15:35:13 +01:00
Laurent Destailleur
8cd538cce4 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-12-14 15:26:58 +01:00
Laurent Destailleur
7ecb313798 Fix: [ bug #1175 ] lien incorrect dans l'onglet Note d'un tiers 2013-12-14 15:26:22 +01:00
Laurent Destailleur
6cc20cb731 Fix: Filter on third parties were wrong for external users. 2013-12-14 15:21:15 +01:00
Laurent Destailleur
5a4b5dcc26 Fix: Missing condition 2013-12-14 14:21:27 +01:00
Laurent Destailleur
ad0d79a831 Merge pull request #1346 from marcosgdf/translation 
Corrected translation
 2013-12-13 18:51:04 -08:00
Laurent Destailleur
c94083b56e Fix: W3C. No form into table. Make some browsers crazy. 2013-12-14 02:33:44 +01:00
Laurent Destailleur
42f032ded3 Merge remote-tracking branch 'origin/3.4' into 3.5 2013-12-14 01:30:15 +01:00
Laurent Destailleur
b83f664ced Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-12-14 01:29:24 +01:00
Laurent Destailleur
88aa0ad4da Fix: Doxygen problems 2013-12-14 01:28:59 +01:00
Laurent Destailleur
5cd6c05384 Fix: Uniformize amounts 2013-12-14 00:31:29 +01:00
Laurent Destailleur
c51fa7048c Fix: text must not be encoded when provided as data of a function. 2013-12-13 21:12:18 +01:00
Alexis Algoud
4844aed67e Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5 2013-12-11 15:15:30 +01:00
Alexis Algoud
895f5452b4 In some cases of improper use of the delete () function, the complete repertoire of propale objects, invoice or order was deleted. 
Ex in agefodd module:
	$obj_link=new Propal($db);
        $obj_link->id=$agf->propalid;
        $resultdel=$obj_link->delete($user);

To prevent misuse of the function, the reference is not considered given
 2013-12-11 15:14:29 +01:00
Regis Houssin
0247241277 Fix: wrong path with multicompany module 2013-12-11 12:23:36 +01:00
Laurent Destailleur
75703a03cc Merge remote-tracking branch 'origin/3.4' into 3.5 2013-12-10 21:48:22 +01:00
Laurent Destailleur
f0eb98c27a Fix: Serious pb with loading stocks. If we use product->stock_reel or 
product->stock_warehoure[], we must call product->load_stock() after the
product->fetch().
 2013-12-10 19:42:49 +01:00
Laurent Destailleur
a6b188ed93 Fix: We should not load stock details at each product fetch 2013-12-10 19:41:45 +01:00
Laurent Destailleur
ad420bbf42 Mark file as bugged (seriously) 2013-12-10 18:56:02 +01:00
Laurent Destailleur
aa4ae60826 Fix: sql where on an int must not contains ' 2013-12-10 18:54:44 +01:00
Laurent Destailleur
ce3047203f Fix: Missing db transaction 2013-12-10 18:54:07 +01:00
Laurent Destailleur
286bdf91d4 Better detection of corrupted module files. 2013-12-10 18:52:48 +01:00
Marcos García de La Fuente
d226abcdfc Corrected translation 2013-12-10 14:30:40 +01:00
Laurent Destailleur
a89a4ee81a Fix: Delete vat entry when bank line was already deleted. 2013-12-09 22:39:41 +01:00
Laurent Destailleur
c49af3da48 Fix: fields too large 2013-12-09 11:00:36 +01:00
Laurent Destailleur
72250f656e Merge remote-tracking branch 'origin/3.4' into 3.5 2013-12-09 02:17:43 +01:00
Laurent Destailleur
705192215a Merge pull request #1341 from marcosgdf/bug-1182 
Resolved bug #1182: ODT company_country tag is htmlencoded
 2013-12-08 16:49:50 -08:00
Laurent Destailleur
565fb615bc Update gitignore 2013-12-09 01:41:48 +01:00
Laurent Destailleur
bf07bd5b24 Fix: Missing translation 2013-12-08 23:58:27 +01:00
Laurent Destailleur
f804833b9c Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/core/modules/modFacture.class.php
 2013-12-08 22:38:10 +01:00
Laurent Destailleur
825640d645 Fix: Missing special code into export 2013-12-08 21:24:59 +01:00
Marcos García de La Fuente
beb93e9245 Resolved bug #1182: ODT company_country tag is htmlencoded 2013-12-08 20:23:44 +02:00
Laurent Destailleur
a05d9b864a Fix: Test must never be done on a translated string 2013-12-08 16:40:45 +01:00
Laurent Destailleur
7aa2c9dcd1 Fix: Error management with corrupted module files 2013-12-08 02:33:32 +01:00
Laurent Destailleur
37b0780523 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/ecm/tpl/builddatabase.tpl.php
	htdocs/fourn/commande/liste.php
	htdocs/product/admin/product_tools.php
 2013-12-08 00:42:36 +01:00
Laurent Destailleur
d8cd7571ec Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-12-07 18:48:31 +01:00
Laurent Destailleur
b637b28c8b Update ignore files 2013-12-07 18:47:58 +01:00
Laurent Destailleur
0e819ab5cd Fix: Missing test 2013-12-07 16:43:35 +01:00
Laurent Destailleur
73e60e0629 Fix: Mass update of vat must work also for supplier prices 
Conflicts:
	htdocs/product/admin/product_tools.php
 2013-12-07 12:06:41 +01:00
Laurent Destailleur
adf55408a4 Fix: Bad parameter that duplicate info. 2013-12-07 03:23:14 +01:00
Laurent Destailleur
fa0470bdb9 Fix: Mass update of vat must work also for supplier prices 2013-12-07 02:29:24 +01:00
Laurent Destailleur
01a9b23f26 Fix: Vat rate was not set during update 2013-12-07 01:22:27 +01:00
Laurent Destailleur
62e209520a Fix: Update when submitting form 2013-12-07 00:53:58 +01:00
Laurent Destailleur
76d111b09f Fix: W3C form must be outside table tag 2013-12-07 00:26:30 +01:00
Laurent Destailleur
87db1d880b Fix: css 2013-12-06 21:03:59 +01:00
Laurent Destailleur
598a241366 Fix: minor css. 
Fix: Alignement of screenshot was wrong. Wrapping too.
 2013-12-06 10:23:26 +01:00
Laurent Destailleur
f60f5b2751 Fix: css 2013-12-06 10:04:53 +01:00
Laurent Destailleur
b99eddc73e Fix: unit 2013-12-05 21:32:48 +01:00
Laurent Destailleur
42a3cbd27c Fix: Missing css class 2013-12-04 23:21:57 +01:00
Laurent Destailleur
24ce511671 Fix: [ bug #1167 ] Supplier IBAN account number set but no account 
specified warning
 2013-12-04 18:20:58 +01:00
Laurent Destailleur
f2ba1a538b Fix: Useless css styles make jmobile wrong 2013-12-03 20:54:27 +01:00
Laurent Destailleur
533199c151 Fix: Missing translation and missing comments 2013-12-03 20:54:22 +01:00
Florian Henry
c2a8967b52 Much better fix for translated product description into PDF 2013-12-03 17:06:19 +01:00
Laurent Destailleur
6c7e173bba Fix: jmobile broken with css tagtable, tagtr and tagtd 2013-12-02 22:31:02 +01:00
Laurent Destailleur
a3372a9a0a Fix: Regression 2013-12-02 22:14:47 +01:00
Laurent Destailleur
d7bb138f43 Fix: Missing status 4 and 5 2013-12-02 22:12:57 +01:00
Laurent Destailleur
0ff9533786 Missing css 2013-12-02 20:30:15 +01:00
Laurent Destailleur
2c92818488 Missing translations 2013-12-02 20:12:48 +01:00
Alexis Algoud
c49aabe574 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5 2013-12-02 16:06:58 +01:00
Alexis Algoud
bb191021de Add entitytotest test, because a LDAP user can override the entity restriction without this test 2013-12-02 16:04:30 +01:00
Florian Henry
bc4cfd66db Fix: fix unsubscribe URL into mailing when sending manually (not by 
script)
 2013-12-02 15:07:34 +01:00
Laurent Destailleur
b6a910cf34 Fix: jmobile is crazy, we can disable it 2013-12-02 12:34:46 +01:00
Florian Henry
3e712c9c8c Finnaly make it works 2013-12-02 11:11:08 +01:00
Florian Henry
0907d81fcb Avoid strpos bug if string is empty or null 2013-12-02 11:05:07 +01:00
Florian Henry
1ad1b25f6e remove useless space 2013-12-02 10:29:58 +01:00
Florian Henry
1b38d36f28 Better Fix 2013-12-02 10:27:41 +01:00
Laurent Destailleur
38e695b960 Look: Better support for jmobile 2013-12-02 07:38:37 +01:00
Laurent Destailleur
b12fb56be4 Fix regression 2013-12-02 05:59:11 +01:00
Laurent Destailleur
1e50543496 Merge pull request #1331 from GPCsolutions/35b-review 
Fixes for 3.5 beta
 2013-12-01 20:34:51 -08:00
Florian Henry
c0ef63fd74 Bteer fix 2013-12-02 00:22:49 +01:00
Florian Henry
ff9c84fd0e Better test for HTMLentities desc translation 2013-12-02 00:20:50 +01:00
Laurent Destailleur
6c26684284 Fix: [ bug #1166 ] Supplier account number in its card does not respect 
order set in Banks module.
 2013-12-01 23:17:16 +01:00
Florian Henry
11efc20755 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 
Conflicts:
	ChangeLog

Change-Id: I90f7ee62c65ef449c8ca43857d9743d0d953cf4b
 2013-12-01 22:50:18 +01:00
Florian Henry
c6991f97d4 [ bug #1174 ] Product translated description not good into PDF 
Country
 2013-12-01 22:47:22 +01:00
Laurent Destailleur
c54c06e8d3 Fix: [ bug #1171 ] Documents lost in interventions after validating 2013-12-01 21:04:52 +01:00
Laurent Destailleur
45b1273992 Fix: [ bug #1171 ] Documents lost in interventions after validating 2013-12-01 21:03:49 +01:00
Laurent Destailleur
2f88406677 Fix: [ bug #1075 ] POS module doesn't decrement stock of products in 
Delayed payment mode.
 2013-12-01 20:15:08 +01:00
Laurent Destailleur
dbd1c57f0a Fix: [ bug #1075 ] POS module doesn't decrement stock of products in 
Delayed payment mode.
 2013-12-01 20:13:52 +01:00
Laurent Destailleur
820cdde97b Fix: Currency is not visible 2013-12-01 20:13:45 +01:00
Laurent Destailleur
0b9e8d6832 Fix: Alignement 2013-12-01 19:41:41 +01:00
Laurent Destailleur
30428ec6e5 Fix: Control on minimum amount must be one only on standard and 
replacement invoices.

Conflicts:
	htdocs/compta/facture.php
 2013-12-01 19:41:29 +01:00
Laurent Destailleur
a6e4ba7001 Fix: No limits for drafts lists 2013-12-01 19:40:36 +01:00
Laurent Destailleur
bfd229d484 Fix: [ bug #1079 ] External users can't access projects even if it is a 
contact.
 2013-12-01 18:14:19 +01:00
Laurent Destailleur
f207aabe7a Fix: When editing thirdparty, result is not refreshed 2013-12-01 18:13:57 +01:00
Laurent Destailleur
eaa6d987b6 Fix: When database is not synchronized with dir, we clean database. 2013-12-01 17:32:05 +01:00
Laurent Destailleur
84e3457023 Fix: [ bug #1161 ] Search on product label 2013-12-01 16:30:35 +01:00
Laurent Destailleur
8f1a553395 Fix: [ bug #1162 ] Traduction des mi-journées 2013-12-01 16:22:06 +01:00
Laurent Destailleur
395066519b Fix: [ bug #1163 ] SQL Error when searching for supplier orders 2013-12-01 16:18:18 +01:00
Laurent Destailleur
d39ed05c5d Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/comm/propal/list.php
 2013-12-01 16:05:09 +01:00
Raphaël Doursenaud
e24555822e Fixed install generated $dolibarr_main_url_root_alt path 
We now use relative paths.
So let's remove the absolute part from the install generated configuration file.
 2013-11-29 17:28:17 +01:00
Raphaël Doursenaud
771d576e2b Better error wording 2013-11-29 17:23:42 +01:00
Cédric Salvador
22d31817de made getVATRates synchronous to avoid concurrency problems 2013-11-29 12:13:23 +01:00
Grand Philippe
438d7b0fb2 fix regression 2013-11-29 11:04:22 +01:00
Grand Philippe
c0650d6da3 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5 2013-11-29 08:30:46 +01:00
Laurent Destailleur
d0b05bb5af Fix: Restore style code lost by a commit. 2013-11-28 18:55:36 +01:00
Laurent Destailleur
d1e62bebf0 Fix: Removed a merged that we ddidn't want. 2013-11-28 17:01:37 +01:00
Grand Philippe
5b2f9af7dc fix management of all errors messages 2013-11-28 16:44:57 +01:00
Grand Philippe
1ac5bd3f28 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5 2013-11-28 16:39:29 +01:00
Laurent Destailleur
bdf8100d84 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/product/stats/commande_fournisseur.php
 2013-11-28 15:54:12 +01:00
philippe
d5606b6045 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2013-11-28 15:09:16 +01:00
Laurent Destailleur
a3e55822a4 Missing translation 2013-11-28 14:36:13 +01:00
Florian Henry
b9d37fd6f7 [ bug #1159 ] Commercial search "other" give p.note do not exists 2013-11-28 14:28:03 +01:00
Grand Philippe
1fc50c137b Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5 2013-11-28 14:25:42 +01:00
Grand Philippe
c88bb553bd fix wrong example path 2013-11-28 14:25:11 +01:00
Laurent Destailleur
88ae0a7945 Fix: the rename function is bugged with some windows. I add a 
workaround.
Fix: Add also a workaround for [ bug 1064 ] Date/Time in ICS incorrect.
 2013-11-28 12:58:02 +01:00
Florian Henry
5f8e896e0c Fix [ bug #1154 ] Error when closing a service in a contract (pgsql) 2013-11-27 22:58:49 +01:00
Florian Henry
afc729c694 [ bug #1153 ] SQL Error on the VAT main screen (with pgsql) 2013-11-27 22:49:54 +01:00
Florian Henry
2178ab6007 Fix [ bug #1156 ] Update TVA mass update tools do not work 2013-11-27 22:05:29 +01:00
Raphaël Doursenaud
f71b39b1c3 Added missing class member 2013-11-27 15:20:37 +01:00
Laurent Destailleur
c3af8b6b29 Sync from transifex 2013-11-27 14:59:02 +01:00
Laurent Destailleur
6729f03ee6 Merge pull request #1323 from grandoc/3.5 
fix language and standardize code
 2013-11-26 07:28:30 -08:00
Laurent Destailleur
0383dc4706 Fix: 2 bugs during validation of a member 2013-11-26 13:10:00 +01:00
Laurent Destailleur
18ed9d5ca7 Fix: Filter on accountancy report were lost when using "print" view. 2013-11-25 16:51:30 +01:00
Grand Philippe
e8e5f4d943 missing trad 2013-11-25 13:55:01 +01:00
Grand Philippe
203a98d4ae fix language and standardize code 2013-11-25 10:30:02 +01:00
Florian Henry
f1d0879419 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-24 18:07:47 +01:00
Florian Henry
8f9143cef7 revert param_ihm 2013-11-24 18:07:40 +01:00
Grand Philippe
fae27842b7 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5 2013-11-24 14:50:07 +01:00
Grand Philippe
08e44135bf add missing trad 2013-11-24 14:47:44 +01:00
Laurent Destailleur
65b6dca554 Fix: business rule to protect button and action was not synchronized 2013-11-24 13:46:40 +01:00
Laurent Destailleur
4cf2c3d58c Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2013-11-24 13:41:54 +01:00
Laurent Destailleur
8cd0647d7e Fix: business rule to protect button and action was not synchronized 2013-11-24 13:40:33 +01:00
Grand Philippe
1f7e6a42c2 add a Social contributions type and fix some language stuff 2013-11-24 11:33:36 +01:00
Laurent Destailleur
e45406694b Fix: no filter is value is '' 2013-11-23 19:28:41 +01:00
Laurent Destailleur
aa3c16b6af Fix: chars were lost by function 2013-11-23 16:34:08 +01:00
Laurent Destailleur
8e313ef32d Fix: Can add ban record but was not possible to delete 2013-11-23 16:17:20 +01:00
Laurent Destailleur
628e8bea83 Fix: Missing error message when files were too large. 2013-11-23 15:22:27 +01:00
Florian Henry
6615ee7e6f [ bug #1148 ] Product consomation : supplier order bad status 2013-11-23 14:59:28 +01:00
Laurent Destailleur
6ffdc039a2 Fix: When option is not set, it must not appears as set. 2013-11-23 14:51:49 +01:00
Laurent Destailleur
64031f92fa Fix: Problem with W3C and wrapping of some title lines. 2013-11-23 14:50:13 +01:00
Laurent Destailleur
8496b1787c Color too agressive 2013-11-23 14:46:46 +01:00
Florian Henry
cca303cee6 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-22 15:07:16 +01:00
Florian Henry
f852c9a5bb Fix [ bug #1145 ] Agenda button list type do not display 2013-11-22 14:43:15 +01:00
Laurent Destailleur
4a1f6713ff Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/main.lang
 2013-11-21 18:45:33 +01:00
Laurent Destailleur
6f5e78d27e Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-21 18:42:14 +01:00
Laurent Destailleur
29e029161f Fix: Restore translation lost because entry was not set into en_US lang. 2013-11-21 18:41:06 +01:00
Laurent Destailleur
00b0031ddf Fix: If no permission to edit object, form to change category must be 
hidden
Fix: Adding supplier category was saved into wrong table.
 2013-11-21 16:34:38 +01:00
Florian Henry
ea0bbb5896 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-21 12:29:03 +01:00
Florian Henry
7f950d8b45 Fix user pram_ihm, display tab and allow modify button only is user 
right allow it is OK
 2013-11-21 12:28:51 +01:00
Laurent Destailleur
0d853cf73d Fix: [ bug #1118 ] Minor problem on print page link 2013-11-21 02:49:22 +01:00
Laurent Destailleur
9e9a386852 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/compta/facture.php
 2013-11-21 02:19:21 +01:00
Laurent Destailleur
e63dcc5343 Fix: [ bug #1119 ] If no country is selected for a warehouse or thids 
card,
broken IMG is shown
 2013-11-21 02:14:25 +01:00
Laurent Destailleur
23f7de0873 Fix: [ bug #1094 ] Invoice Text Reminder 
Conflicts:
	htdocs/compta/facture.php
 2013-11-21 02:07:13 +01:00
Laurent Destailleur
358175b357 Merge remote-tracking branch 'origin/3.4' into develop 2013-11-20 23:48:06 +01:00
Laurent Destailleur
35596acf40 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/product/fiche.php
 2013-11-20 23:46:33 +01:00
Laurent Destailleur
cb539399a0 Merge pull request #1302 from FHenry/develop 
Fix output of extrafield select list from table
 2013-11-20 14:42:50 -08:00
Laurent Destailleur
a9d5363799 Merge pull request #1313 from altairis-fr/3.3 
[Task 1144 ] Fix wrong max-length of produt ref
 2013-11-20 14:33:57 -08:00
Laurent Destailleur
71484a4e1e Fix: Missing hook declaration 2013-11-20 14:29:50 +01:00
Florian Henry
f88e9425ec Remove useless code (the tag replacement into footer and header is 
already done by SetVar method)
 2013-11-20 14:01:43 +01:00
Florian Henry
306a51f6bd remove useless code (the tag replacement into footer and header is 
already done by SetVar method)
 2013-11-20 13:54:53 +01:00
Laurent Destailleur
413e0908fe Doxygen 2013-11-20 12:55:13 +01:00
Laurent Destailleur
63e1ecccd3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-11-20 12:46:05 +01:00
Laurent Destailleur
b04a12c39a Missing vat rate for canada 2013-11-20 12:45:38 +01:00
Christophe Battarel
e654dac578 [Task 1144 ] Fix wrong max-length of produt ref 2013-11-20 10:33:06 +01:00
Regis Houssin
4c29bddfda Fix: wrong variable name 
Fix: restore address.class.php, this class is used
 2013-11-20 09:40:56 +01:00
Regis Houssin
f305524e29 Revert "Qual: Removed not used file" 
This reverts commit 603c2aa938.
 2013-11-20 09:34:54 +01:00
Florian Henry
ed21b573ea Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-20 00:46:50 +01:00
Florian Henry
0fe870395f Use mtethos Post instead of get 2013-11-20 00:46:04 +01:00
Laurent Destailleur
0e743d5024 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/adherents/admin/adherent.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/document.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/facture/list.php
	htdocs/cron/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/commande/document.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cron.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/nl_NL/categories.lang
	htdocs/langs/nl_NL/commercial.lang
	htdocs/langs/nl_NL/companies.lang
	htdocs/langs/nl_NL/dict.lang
	htdocs/langs/nl_NL/main.lang
	htdocs/langs/nl_NL/margins.lang
	htdocs/langs/nl_NL/products.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/rib.php
 2013-11-19 21:08:02 +01:00
Laurent Destailleur
568c296c6c Merge pull request #1310 from GPCsolutions/develop-nocrlf 
Use LF instead of CRLF
 2013-11-19 11:44:51 -08:00
Laurent Destailleur
25bbe824f1 Merge pull request #1309 from csalvador/develop-formcontract-include 
included the FormContract class to avoid fatal error
 2013-11-19 11:43:53 -08:00
Raphaël Doursenaud
7945011955 Make AJAX new line form work again 
FIXME: Factorize!
 2013-11-19 17:54:36 +01:00
Raphaël Doursenaud
83f99b5ba6 Use LF instead of CRLF 2013-11-19 14:36:55 +01:00
Cédric Salvador
c885389ac6 included the FormContract class to avoid fatal error 2013-11-19 14:23:17 +01:00
Florian Henry
870b78fc19 [ bug #1142 ] Set paiement on invoice 2013-11-19 10:41:00 +01:00
Laurent Destailleur
6596a105e7 Merge pull request #1307 from hameau/patch-2 
Update printipp.lang
 2013-11-18 11:43:50 -08:00
hameau
9d2dee207a Update bills.lang 
Minor typos
 2013-11-18 18:13:34 +01:00
hameau
a94fb12e5e Update other.lang 
Minor typo
 2013-11-18 18:07:17 +01:00
hameau
c04d454d4f Update withdrawals.lang 
Minor typos.
 2013-11-18 18:05:36 +01:00
hameau
0501491475 Update printipp.lang 
Minor typos; minor translation fr->en.
 2013-11-18 17:45:19 +01:00
hameau
b28d15574e Update main.lang 
Minor typos; capitalise month names; minor fr->en.
 2013-11-18 17:34:08 +01:00
Laurent Destailleur
a71e4c598a Fix: Must navigate between all thirdparties elligible for tab. 2013-11-18 15:41:42 +01:00
Laurent Destailleur
2d260fa6dd Fix: Missing alignement 2013-11-18 14:25:53 +01:00
Laurent Destailleur
69f0d596ba Fix: Pagination 2013-11-18 12:20:53 +01:00
Laurent Destailleur
e8101e3cde Fix: Missing field 2013-11-18 12:00:42 +01:00
Laurent Destailleur
2b63fd67b5 Minor fix in cron feature 2013-11-18 11:42:28 +01:00
Laurent Destailleur
5703dfe55a Trans 2013-11-18 11:31:34 +01:00
Laurent Destailleur
d209d931e4 Doxygen 2013-11-18 00:29:11 +01:00
Laurent Destailleur
4356496ee8 Qual: File is not a class of a module 2013-11-18 00:20:05 +01:00
Laurent Destailleur
afa5bdb837 Fix: phpunit error 2013-11-18 00:12:13 +01:00
Laurent Destailleur
6a5b3e2020 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-11-17 23:26:37 +01:00
Laurent Destailleur
48570f599a Fix: form is not allowed into a table. This break some javascript and 
make some browsers crazy.
 2013-11-17 23:25:25 +01:00
Florian Henry
cc43fac0aa Add status filter into product list 2013-11-17 17:25:14 +01:00
Florian Henry
00064ed500 Add status filter into user list 2013-11-17 17:09:58 +01:00
Florian Henry
a2368daa57 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-17 17:07:00 +01:00
Christophe Battarel
89a5638908 Fix bad translation on margin config 2013-11-17 12:59:33 +01:00
Laurent Destailleur
930328f235 Prepare 3.5 beta 2013-11-17 03:33:58 +01:00
Laurent Destailleur
0f4ceca8ec Fix: tons of bugs into ecm module 2013-11-17 02:59:01 +01:00
Laurent Destailleur
45aac81b71 Doc: More comments 2013-11-16 18:12:13 +01:00
Laurent Destailleur
3c0ee64648 New: Add links to social networks 2013-11-16 15:40:46 +01:00
Laurent Destailleur
946c91dc72 Fix: Removed deprecated support links 2013-11-16 15:08:57 +01:00
Laurent Destailleur
d28eacebd7 Fix: Remove an edit button that is not implemented. 2013-11-16 14:53:08 +01:00
Laurent Destailleur
8ec50fce23 Move warning at correct place. 
Fix: Reset of amount was not working
 2013-11-16 14:26:42 +01:00
Laurent Destailleur
b7190d2609 Fix: Several bugs. 2013-11-16 13:00:21 +01:00
Laurent Destailleur
5b243abe4b Fix: Miscellaneous fixes 2013-11-16 12:00:08 +01:00
Laurent Destailleur
d0d9cce146 Fix: price should not be used to compare amounts. Price is a formated 
string, not an amount.
 2013-11-15 22:15:48 +01:00
simnandez
c8f1a26d25 Format with price function 2013-11-15 17:55:48 +01:00
simnandez
618bf4d75e Remove td 2013-11-15 17:48:19 +01:00
simnandez
0aba9b02b8 Add alert for outstanding bill 2013-11-15 17:43:13 +01:00
Florian Henry
7696730680 Fix output of extrafield select list from table (in case of filter with 
extrafields table)
 2013-11-15 15:44:04 +01:00
Florian Henry
85ea8b4161 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-15 15:41:37 +01:00
Laurent Destailleur
1e008ede3c Merge pull request #1298 from Pfontaine/features/multi_rib 
Features/multi rib
 2013-11-15 06:27:58 -08:00
Laurent Destailleur
52b66a839b Merge pull request #1296 from FHenry/3.4 
Better nl_NL translation
 2013-11-15 05:06:44 -08:00
Laurent Destailleur
c324f6a9a3 Merge pull request #1295 from FHenry/develop 
Display customer code (according setting) into list
 2013-11-15 05:05:36 -08:00
Laurent Destailleur
ef9db84a88 Merge pull request #1297 from GPCsolutions/3.4-dbupgradefix 
Sync db upgrade with db install to avoid silly upgrade errors
 2013-11-15 05:05:01 -08:00
Laurent Destailleur
a92aa14459 Merge pull request #1299 from altairis-fr/3.4 
fix wrong buy price update (confusion between entity and npr !)
 2013-11-15 05:04:07 -08:00
Laurent Destailleur
a2380805c8 Merge pull request #1300 from Pfontaine/fix/contact_soc 
fix contact creation
 2013-11-15 05:01:01 -08:00
Laurent Destailleur
b3a1d695cd Qual: Better message for total of buying price 
Fix: Little debug of add link feature. Link was broken because of
missing http, fix W3C making output wrong with some browsers.
 2013-11-15 11:43:16 +01:00
aspangaro
8050f8e9fe Fix problem field 2013-11-14 21:40:30 +01:00
aspangaro
e8c7bb9c62 Fix for language 2013-11-14 21:02:33 +01:00
Laurent Destailleur
a0358dc0c2 Better management of price of subproducts feature 2013-11-14 20:54:40 +01:00
Florian Henry
673c701ebc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-14 19:41:43 +01:00
Florian Henry
05e0af0f23 WebService contact with statut (the new field) 2013-11-14 19:41:27 +01:00
Laurent Destailleur
8b60c79033 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-14 17:17:19 +01:00
Peter Fontaine
5a1df20c80 fix contact creation 2013-11-14 17:16:27 +01:00
Laurent Destailleur
b911d30684 Fix: Stock into subproduct was wrong 
New: Show best sell price and total for virtual products
 2013-11-14 17:16:17 +01:00
simnandez
b9c8852471 Qual: Improve suppliers orders manual receivings 2013-11-14 17:08:59 +01:00
Laurent Destailleur
2e5320a532 Qual: Clean and uniformize code 2013-11-13 23:35:33 +01:00
Laurent Destailleur
cf3d6d410c Fix: Use correct css 2013-11-13 21:50:16 +01:00
Florian Henry
fe0006c71d Merge from dev 2013-11-13 21:34:02 +01:00
Florian Henry
a8e31ad956 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/company.lib.php

Change-Id: Iec6a98430bfd500defda256862a1ed7869ef407a
 2013-11-13 21:33:12 +01:00
Laurent Destailleur
588a30fa80 Fix: Bad status 2013-11-13 21:14:11 +01:00
Laurent Destailleur
e63542d8a6 Fix: avoid scroll 2013-11-13 20:37:05 +01:00
Laurent Destailleur
5a8f4905d6 Fix: bad link into ecm module 2013-11-13 20:36:07 +01:00
Laurent Destailleur
7a714906a0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-11-13 18:46:25 +01:00
Laurent Destailleur
d57aa65d30 Fix: Add option to fix warning not visible when there is preactivated 
modules
 2013-11-13 18:45:36 +01:00
Christophe Battarel
7dbe2bcf2c fix wrong buy price update 2013-11-13 18:41:31 +01:00
Florian Henry
652d7db0b4 Get Status from getLibStatus ! 2013-11-13 17:26:29 +01:00
Florian Henry
6d8871b4cf Add filter on show_contact company.lib.php 2013-11-13 17:02:30 +01:00
Florian Henry
0065adc298 Wrong call of show_contact into fourn/fiche.php 2013-11-13 16:37:17 +01:00
simnandez
e66371c6d1 New: Link to communities. Add official Support links 2013-11-13 16:35:02 +01:00
Peter Fontaine
844531e1d2 missing param phpdoc 2013-11-13 16:20:52 +01:00
Peter Fontaine
b965103fc3 Multiple Bank Account Number for Third Party 2013-11-13 15:40:17 +01:00
Laurent Destailleur
995bec6112 Fix: bad migration of 3.4 that make this text instead of varchar(50) 2013-11-13 15:09:22 +01:00
Florian Henry
a73275b9c1 Add prospect code client into prospect list 2013-11-13 13:17:32 +01:00
Florian Henry
4d0f554f33 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-13 13:15:56 +01:00
Laurent Destailleur
87f214dad4 Remove "realtime support" page. It was not up to date. 2013-11-13 12:47:59 +01:00
Florian Henry
8fca860a2d Add status filter on contact list 2013-11-12 15:40:00 +01:00
Raphaël Doursenaud
4ad5413163 Sync db upgrade with db install to avoid silly upgrade errors 2013-11-12 15:36:51 +01:00