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

4259 Commits

Author SHA1 Message Date
Grand Philippe
44683a0e21 english language standardization 2013-02-27 11:58:50 +01:00
Grand Philippe
79c2e17cbb english language standardization 2013-02-25 17:56:41 +01:00
Grand Philippe
b081589129 english language standardization 2013-02-25 09:52:24 +01:00
Grand Philippe
86de772b31 english language standardization 2013-02-24 17:08:52 +01:00
Grand Philippe
6adc9eb7f2 english language standardization 2013-02-23 17:40:28 +01:00
Grand Philippe
8d7654916f english language standardization 2013-02-23 15:46:12 +01:00
Grand Philippe
b699b79a15 english language standardization 2013-02-23 15:36:12 +01:00
Grand Philippe
7c2a4500d6 fix: change name with lastname 2013-02-23 12:30:01 +01:00
Grand Philippe
182fdbce32 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-23 10:04:31 +01:00
Grand Philippe
9a431bb8e3 english standardization 2013-02-22 16:33:48 +01:00
Grand Philippe
890b9ca44a english standardization 2013-02-22 16:27:58 +01:00
Laurent Destailleur
327f4062c7 New: Prepare code to be able to choose bank account to show when 
building pdf and payment mode is withdraw.
 2013-02-22 12:04:38 +01:00
Grand Philippe
303577a7fa english standardization 2013-02-22 09:36:01 +01:00
Grand Philippe
0af5c434af english standardization 2013-02-22 09:29:34 +01:00
simnandez
4cb6072f03 New: [ task #707 ] Create option ProfIdx are mandatory to validate a 
invoice
 2013-02-21 11:03:14 +01:00
Laurent Destailleur
b21cb5b899 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	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/compta/facture.php
	htdocs/filefunc.inc.php
 2013-02-17 17:25:38 +01:00
Laurent Destailleur
9a951e4d6d Fix: When creating invoice from other object, type must be standard only 2013-02-17 17:12:19 +01:00
Laurent Destailleur
b434f58af3 Fix: When creating invoice from other object, type must be standard only 2013-02-17 17:12:06 +01:00
Laurent Destailleur
d2074d1a17 Fix: When creating invoice from other object, type must be standard only 2013-02-17 17:06:55 +01:00
Laurent Destailleur
e56e182fe9 Fix: When creating invoice from other object, type must be "standard". 2013-02-17 16:37:28 +01:00
Grand Philippe
2bfd6c40d0 fix trad : change adresse versus address 2013-02-15 19:26:09 +01:00
Maxime Kohlhaas
1cfd32680a Fix : set some vars when invoice is back to draft status 2013-02-13 15:43:27 +01:00
Laurent Destailleur
3eb485d521 Qual: Removed TODO, deprecated code and deprecated properties. This also 
fix missing combo box of contacts onto CC.
 2013-02-12 17:08:21 +01:00
Regis Houssin
fcee35c65d Fix: $hookmanager is a global object 2013-01-26 10:35:30 +01:00
Laurent Destailleur
56e11e52fa New: hookmanager class is used frequently and is a factory object, so we 
can move it during init of environment and use it globally.
 2013-01-25 19:12:54 +01:00
simnandez
ad3645f7f4 Fix: [ bug #698 ] Bad calculation of totals of associated documents 2013-01-25 11:37:30 +01:00
simnandez
03d6903248 Fix: [ bug #698 ] Bad calculation of totals of associated documents 2013-01-24 12:53:42 +01:00
Laurent Destailleur
9f44161e55 New: Can attach file for trip and expenses module 2013-01-24 12:47:06 +01:00
Laurent Destailleur
8682d3c928 Fix: Note not visible 2013-01-24 12:16:00 +01:00
Regis Houssin
e8ce9cecf2 Fix: broken features, special_code also used by externals modules ! 2013-01-22 21:36:30 +01:00
Regis Houssin
06a0da990b Fix: broken features, special_code also used by externals modules ! 2013-01-22 21:35:15 +01:00
Laurent Destailleur
abb6daf2dc Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
 2013-01-19 16:29:16 +01:00
Laurent Destailleur
3551dff18a Fix: [ bug #671 ] Product country origin is automatically entered in 
description of invoices, but not in invoices generated from orders
 2013-01-19 15:57:28 +01:00
Laurent Destailleur
0e13b3872d Fix: Removed warnings 2013-01-19 14:32:37 +01:00
Laurent Destailleur
a5b174eccc Fix: Architecture of getCurrency was wrong. Cache was not stored 
correctly and dict file loaded several times. There was also bug on PHP
without mb_string function.
Now function is a method of $langs object. All bug fixes.
 2013-01-18 15:57:11 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Laurent Destailleur
29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-01-13 19:33:54 +01:00
simnandez
ffbb611eb4 [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 2013-01-13 10:57:39 +01:00
simnandez
b1369a2f01 [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 2013-01-12 22:08:52 +01:00
simnandez
96c5eacf4a [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 2013-01-12 09:58:21 +01:00
Regis Houssin
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +01:00
Marcos García
be40114541 Fixed translation problems with Prelevement module 2013-01-09 21:33:55 +01:00
Regis Houssin
a7ed40b10d Fix: empty value if combobox disabled 2013-01-09 10:43:21 +01:00
Regis Houssin
a278ae7371 Fix: empty value if combobox disabled 2013-01-09 10:40:36 +01:00
Laurent Destailleur
142f171e50 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/.gitignore
 2013-01-08 11:10:47 +01:00
Laurent Destailleur
ec664aaa71 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-01-07 00:42:02 +01:00
Laurent Destailleur
091e469050 Fix: [ bug #622 ] attaching wrong file when sending the invoice via 
e-mail
 2013-01-07 00:40:18 +01:00
Laurent Destailleur
0f5a80a40f Fix: Bad var name 2013-01-07 00:14:38 +01:00
eldy
2c59c6311f Merge remote-tracking branch 'origin/3.3' into develop 2013-01-06 21:36:39 +01:00
Marcos García
ad5d2c3459 Added missing translations, improved es_ES translations and translated untranslated text in modules admin page 2013-01-05 19:23:16 +01:00
simnandez
b4204b9c25 Fix: Withdrawal payment warning 2013-01-04 20:54:15 +01:00
simnandez
68866eaa5f Fix: Withdrawal payment warning 2013-01-04 11:07:31 +01:00
Laurent Destailleur
4e27969317 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
 2013-01-02 22:15:58 +01:00
Laurent Destailleur
96416735df Fix: [ bug #618 ] External accounts can access confidential informations 
(a lot)
 2013-01-02 18:43:59 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
5740c7e694 Fix: change for a neutral email 2012-12-30 15:11:07 +01:00
Laurent Destailleur
18bfceafca Merge remote-tracking branch 'origin/3.3' into develop 2012-12-30 14:17:05 +01:00
Laurent Destailleur
a1b0fbcc2c Fix: [ bug #659 ] Comment in recurrent invoices is not stored 
Fix: Missing payment mode
 2012-12-30 14:14:52 +01:00
Laurent Destailleur
2d0dea18ce Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/compta/bank/search.php
 2012-12-29 17:38:12 +01:00
Laurent Destailleur
a9e9b761cc Merge pull request #560 from FHenry/develop 
Fix [ bug #658 ] Seacrh on bank do not work for description
 2012-12-29 08:33:17 -08:00
Laurent Destailleur
bc489773e8 Merge pull request #559 from FHenry/3.3 
Fix [ bug #658 ] Seacrh on bank do not work for description
 2012-12-29 08:32:47 -08:00
Laurent Destailleur
caf4130fb7 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2012-12-29 16:41:28 +01:00
Laurent Destailleur
44fe52d5b2 Fix: Missing field 2012-12-29 16:32:47 +01:00
Laurent Destailleur
35a9fbda59 Merge pull request #556 from marcosgdf/3.3 
Improved translations
 2012-12-29 07:29:29 -08:00
fhenry
5099bc5e89 Fix [ bug #658 ] Seacrh on bank do not work for description 2012-12-29 16:06:11 +01:00
fhenry
32966fe25f Fix [ bug #658 ] Seacrh on bank do not work for description 2012-12-29 16:02:02 +01:00
Marcos García
0c113d33a6 Removed unuseful code 
Some lines may be marked as changed but they are not because of incorrect line endings
 2012-12-29 13:12:45 +01:00
Marcos García
316552f4ea Added missing translation and fixed references to incorrect variable 2012-12-29 00:59:16 +01:00
Marcos García
1b153aef93 Fixed donation payment mode translation and another problem with donation edit form 2012-12-29 00:46:25 +01:00
Laurent Destailleur
f9700dc941 Fix: [ bug #651 ] FusionPDF created files cannot be deleted 2012-12-27 14:37:15 +01:00
simnandez
7cbcd1fc5d Fix: Withdrawal spanish generation adapted to new AEAB rule: profid1 is 
mandatory
 2012-12-12 17:00:29 +01:00
simnandez
488d482508 Fix: Withdrawal spanish generation adapted to new AEAB rule: profid1 is 
mandatory
 2012-12-12 16:57:53 +01:00
Grand Philippe
a91a96e72e merge 2012-12-10 10:02:13 +01:00
Maxime Kohlhaas
4cffe3e5a3 Fix : minor html fix + changelog 2012-12-07 11:06:51 +01:00
Grand Philippe
c6a3add952 fix : typo 2012-12-06 17:09:12 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50 
commits !
 2012-12-01 15:45:05 +01:00
Christophe Battarel
12284bf676 show local taxes on invoice 2012-11-28 12:04:31 +01:00
Regis Houssin
2d5368e135 Fix: converting line delimiters 2012-11-20 12:11:19 +01:00
Laurent Destailleur
f58d0636a1 Doxygen 2012-11-18 16:55:00 +01:00
Laurent Destailleur
eb7dc8934c Fix: Do not loose label 2012-11-18 16:41:10 +01:00
Laurent Destailleur
fe86b5d29e Fix: 2 other fixes on option MAIN_JS_ON_PAYMENT 2012-11-17 20:25:44 +01:00
Laurent Destailleur
5b02ff3a86 Fix: 3 fixes on option MAIN_JS_ON_PAYMENT (css, bad path, removed 
forced var)
 2012-11-17 19:55:19 +01:00
Regis Houssin
8908f977b8 Fix: converting line delimiters !!! 2012-11-14 11:31:08 +01:00
Regis Houssin
b95ab2239f Fix: remove unused code 2012-11-12 09:43:12 +01:00
Laurent Destailleur
f9dec36d7a Fix: Regression 2012-11-11 15:44:02 +01:00
Laurent Destailleur
831fe6a29e Fix: More fix about the new localtax system 2012-11-06 23:45:16 +01:00
Regis Houssin
7de5a7fd3f Fix: compatibility with multicompany 2012-11-06 14:56:49 +01:00
Laurent Destailleur
ba56e679bd Fix: Calculation of default date for payment term was not using 
function.
 2012-11-05 17:21:05 +01:00
Laurent Destailleur
135a622076 Fix: Bad parameter 2012-11-03 15:35:11 +01:00
Laurent Destailleur
df7bedf955 Fix: [ bug #592 ] stock sold value is wrong 2012-11-03 12:12:24 +01:00
Laurent Destailleur
7fd16c3a7e Qual: Error management 2012-11-03 11:54:32 +01:00
Laurent Destailleur
118733c600 Fix: Error message type 2012-11-03 11:26:45 +01:00
Laurent Destailleur
375f464553 Fix: Option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS was not used into 
journals.
 2012-11-03 04:29:38 +01:00
Laurent Destailleur
79e3b4d792 Fix: Missing br 2012-11-03 04:02:48 +01:00
Laurent Destailleur
8709933288 Fix: Too much sanitizing 2012-11-03 00:47:09 +01:00
Laurent Destailleur
13ef8491b7 Fix: Error management 2012-10-31 15:09:42 +01:00
Laurent Destailleur
8ea48b28eb New: More complete setup for bank ids according to countries 2012-10-31 00:46:46 +01:00
Laurent Destailleur
1d7820c5ac New: English bank account need a bank code (called sort code) to 
identify an account.
 2012-10-31 00:22:13 +01:00
Regis Houssin
82cb0802d0 Fix: broken feature, missing $page 
Fix: bad field name
 2012-10-28 02:14:08 +02:00