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

1155 Commits

Author SHA1 Message Date
jfefe
f16c9dd3ac Fix : bad permission 2013-03-16 00:19:53 +01:00
jfefe
f1a05528ad Show extrafield separator on invoice 2013-03-16 00:16:30 +01:00
Laurent Destailleur
a86c6ac39d New: price function can show price with currency symbol. 2013-03-15 15:59:51 +01:00
frederic34
9c8a9ff7dc Print IPP 2013-03-11 23:35:31 +01:00
jfefe
ba8525bd6a Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extrafields 
Conflicts:
	htdocs/install/doctemplates/invoices/template_invoice.odt
	htdocs/install/doctemplates/proposals/template_proposal.odt
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-03-11 05:21:35 +01:00
simnandez
0c8d3336c2 [ task #707 ] Create option ProfIdx are mandatory to validate a invoice 2013-03-07 18:41:56 +01:00
jfefe
3ccb0fb92c Edit extrafields on customer invoice 2013-03-06 04:54:08 +01:00
jfefe
7260e139df Add extrafields support when create a customer invoice 2013-03-06 04:17:14 +01:00
Laurent Destailleur
c37e873ab4 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
 2013-03-05 18:32:01 +01:00
fhenry
f793ed83f6 Fix [ bug #747 ] 2013-03-04 15:36:40 +01:00
Grand Philippe
b081589129 english language standardization 2013-02-25 09:52:24 +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
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
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
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
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
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
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
091e469050 Fix: [ bug #622 ] attaching wrong file when sending the invoice via 
e-mail
 2013-01-07 00:40:18 +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
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
Grand Philippe
a91a96e72e merge 2012-12-10 10:02:13 +01:00
Christophe Battarel
12284bf676 show local taxes on invoice 2012-11-28 12:04:31 +01:00
Regis Houssin
8908f977b8 Fix: converting line delimiters !!! 2012-11-14 11:31:08 +01:00
Laurent Destailleur
831fe6a29e Fix: More fix about the new localtax system 2012-11-06 23:45:16 +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
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
13ef8491b7 Fix: Error management 2012-10-31 15:09:42 +01:00
Laurent Destailleur
cbff238cbd New: Support property "required" for extra fields. 2012-10-25 16:23:58 +02:00
Regis Houssin
446a81b4c4 Fix: move class in template 2012-10-18 10:35:55 +02:00
Laurent Destailleur
b160b97cbe New: Add warning message. 2012-10-17 14:23:56 +02:00
Regis Houssin
df1e4a401a Fix: convert line delimiters 
Info: the last Eclipse version fix this problem
 2012-10-13 11:42:58 +02:00
Laurent Destailleur
091966902e Fix: for special_code=3 2012-10-12 22:18:31 +02:00
Regis Houssin
bcf46d00f0 Fix: convert line delimiters !! 2012-09-30 21:26:58 +02:00
Laurent Destailleur
3a98f6903e Fix: If a customer has 2000 invoices, creating next one make 2000 
requests instead of 1.
 2012-09-27 20:54:04 +02:00
Laurent Destailleur
07fa800360 Fix: Correct concat when mixing not html and html descriptions 2012-09-16 20:23:57 +02:00
Regis Houssin
43c0a03758 Fix: strict mode tornado 2012-09-15 11:21:22 +02:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Laurent Destailleur
27846d1698 Fix: Start and end date not saved at project creation 
Conflicts:
	htdocs/projet/class/project.class.php
 2012-08-31 12:55:10 +02:00
Regis Houssin
f81b696890 Fix: code optimization 2012-08-31 09:25:27 +02:00
Regis Houssin
18b7549c52 Fix: use GETPOST('usenewaddlineform') instead MAIN_FEATURES_LEVEL 2012-08-31 08:51:08 +02:00
Marcos García
4209898d20 Lower-cased Header function 2012-08-31 05:58:38 +02:00
Regis Houssin
327e51ccd9 Fix: more simple 2012-08-29 17:40:13 +02:00
Regis Houssin
62a7847c5b Fix: [ task #498 ] debug 2012-08-28 15:35:32 +02:00
Regis Houssin
3e2be54ead Fix: restore old method 2012-08-27 19:11:44 +02:00
Regis Houssin
f322ec50ed New: [ task #498 ] - final part 2012-08-25 15:21:34 +02:00
Regis Houssin
c9113458d9 New: [ task #498 ] part 3 2012-08-25 03:28:30 +02:00
Regis Houssin
995c7f13d3 New: [ task #498 ] part3 2012-08-23 13:45:51 +02:00
Regis Houssin
f4d75e87d3 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into task498_objectline

Conflicts:
	htdocs/core/class/commonobject.class.php
 2012-08-23 07:53:48 +02:00
Regis Houssin
c8e1aca7d8 New: [ task #498] part2 2012-08-23 07:50:20 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Regis Houssin
97474bf77f Fix: strict mode safari 2012-08-16 19:18:24 +02:00
Regis Houssin
a64723ea74 Fix: replace with new event message system 2012-07-29 16:11:52 +02:00
Regis Houssin
0aa6694c95 Fix: broken event message 2012-07-29 15:47:24 +02:00
Regis Houssin
eee5653c54 Fix: try to use the new message system 2012-07-29 12:54:19 +02:00
Regis Houssin
9cdba5bb61 Fix: try another method more clean and can be deployed on any type of 
message
 2012-07-29 08:26:33 +02:00
Regis Houssin
75588c2eb3 Merge pull request #272 from marcosgdf/backtolist-links 
Created BackToList links
 2012-07-28 13:15:42 -07:00
Regis Houssin
c7bacecf10 Fix: try to use another method for messages 2012-07-28 22:07:27 +02:00
Marcos García
2eeaad1352 BackToList links in Financial section 2012-07-28 21:22:59 +02:00
Laurent Destailleur
105e91dfea Fix: Redirect after delete to correct page 2012-07-25 15:03:06 +02:00
Laurent Destailleur
dce9b96260 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/lib/repair.lib.php
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-07-25 12:20:45 +02:00
Regis Houssin
a4f35bbfd5 Fix: uniformize $mesgs 2012-07-23 21:45:22 +02:00
Regis Houssin
eba0db736e Fix: try to use $mesgs (array) for stock all messages and 
$_SESSION['dol_message'] for specific message when a page is reloading
 2012-07-23 21:31:10 +02:00
Regis Houssin
fafd79a0f8 Fix: uniformize code (in progress) 2012-07-20 09:57:50 +02:00
Christophe Battarel
8e8fd72459 correct margin infos display on order 2012-07-19 16:25:40 +02:00
Christophe Battarel
55d547348a margin management for invoices 2012-07-19 11:07:50 +02:00
Regis Houssin
4291db4a93 Fix: strict mode 2012-07-10 18:57:27 +02:00
Regis Houssin
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Laurent Destailleur
1ddbc12258 Fix: No link if not found into table 2012-06-14 22:56:14 +02:00
Laurent Destailleur
9a3e3e8e18 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-10 21:55:46 +02:00
Regis Houssin
cc18dab5c9 Fix: missing remove_file action 
Fix: use object instead id and store odt filename in object for use in
triggers
 2012-06-10 17:09:10 +02:00
Laurent Destailleur
e6cd400bc3 Qual: List of elements must be into a page called "list.php". 2012-06-09 19:16:31 +02:00
Raphaël Doursenaud
6c963fc591 Fixed a bug preventing invoice sorting by authors 2012-06-01 03:07:05 +02:00
Regis Houssin
b5246add8d Fix: big problem with files upload and more compatible with external 
modules
 2012-05-30 00:07:06 +02:00
Regis Houssin
9cf2ea492c Fix: broken features with external module 2012-05-21 18:44:09 +02:00
juanjo
a6b0242f8a [ task #407 ] Manage PDF hidden items 2012-05-21 17:12:57 +02:00
Regis Houssin
8ec51c2a6b Fix: fetch object for hookmanager 2012-05-10 19:30:10 +02:00
Laurent Destailleur
dc09960143 New: Add bank account on payment list of invoice card. 2012-05-08 15:43:58 +02:00
Laurent Destailleur
d5f0c487ad Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-05-07 10:36:45 +02:00
Laurent Destailleur
ad26cff69f Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-06 02:33:15 +02:00
Laurent Destailleur
b4f83d33a6 Merge pull request #180 from GPCsolutions/typo 
Typo
 2012-05-05 17:32:51 -07:00
Laurent Destailleur
e9fb0f427c New: Add customer invoice ref on invoices 2012-05-06 02:27:09 +02:00
Laurent Destailleur
f7263d1773 Fix: Do not lose filter 2012-05-05 20:07:34 +02:00
Laurent Destailleur
29c7c109fa New: Can filter on user contact 2012-05-05 19:41:38 +02:00
Laurent Destailleur
143e524db6 New: Can filter on contact 2012-05-05 17:45:17 +02:00
Laurent Destailleur
75cefe53cf Fix: Set payment term 2012-05-04 18:30:35 +02:00
Raphaël Doursenaud
9237d7b8ee Fix: typo in unset 2012-04-26 15:32:34 +02:00
Laurent Destailleur
f482ba18c3 Fix: We keep notes 2012-04-07 18:28:03 +02:00
Laurent Destailleur
317abb46fd Fix: Start war bug 2012-04-07 02:24:32 +02:00
Laurent Destailleur
289a2afee9 Checkstyle 2012-04-02 18:29:08 +02:00
Laurent Destailleur
daf2a19396 New: Add signature at end of predefined email text 2012-03-28 00:56:12 +02:00
Laurent Destailleur
0fd372e5da Trans: Update language files 
New: Prepare code to allow any module to change/add content of
predefined mail and signature.
 2012-03-22 23:52:02 +01:00
Regis Houssin
808c4b5732 New: testing a new method to avoid reloading the page 2012-03-18 14:06:55 +01:00
Laurent Destailleur
a7a55645d8 Fix: Some fix when using fckeditor with notes. 
Qual: Uniformize code to use new system for notes.
Qual: Removed duplicate updatenote method into commandefournisseur
class.
 2012-03-18 00:59:24 +01:00
Regis Houssin
281c6b7f2a New: sharing code of contact and note tabs 2012-03-17 16:05:58 +01:00
Regis Houssin
1622a86d71 New: possibility to view/edit notes in invoice card 2012-03-16 11:12:59 +01:00
Regis Houssin
0df083a8d8 Fix: update security 2012-03-16 10:55:29 +01:00
Laurent Destailleur
245edb8596 Fix: Maxi debug on sending document by email. Works now with odt too. 2012-03-16 00:34:41 +01:00
Laurent Destailleur
bc94ec9cd6 Fix: We allow to add credit not higher than invoice amount. 2012-03-15 22:51:02 +01:00
Laurent Destailleur
1f0cddc464 Add hidden option to allow negative invoices (for test purpose only, 
negative invoices should be done using credit note).
 2012-03-15 22:38:55 +01:00
Regis Houssin
777c402f62 Fix: add elseif 2012-03-13 20:21:08 +01:00
Regis Houssin
4d1416d0e6 Fix: remove unused and deprecated method 2012-03-13 20:15:13 +01:00
Regis Houssin
f8bf7ade83 Fix: move method in common class 2012-03-13 20:01:10 +01:00
Regis Houssin
150f3ecfe3 Fix: move method in common class 2012-03-13 19:24:11 +01:00
Regis Houssin
3871f3a6dd Fix: missing contacts with order to invoice 2012-03-11 11:57:15 +01:00
simnandez
31125d560f New: [ task #156 ] Create an invoice from a delivery receipt 2012-03-10 18:55:21 +01:00
Regis Houssin
9301def08d Fix: rename method 2012-03-02 15:03:14 +01:00
Laurent Destailleur
1645ddbe47 Sec: Sanitize all input for ids. 2012-02-27 22:26:22 +01:00
Laurent Destailleur
868f94c08b Add style noshadow 2012-02-21 23:35:38 +01:00
Regis Houssin
ea83e474dc New: add possibility to linked other objects from external modules 2012-02-22 01:19:05 +08:00
Laurent Destailleur
52e2253e20 Fix: A delete must always be done on a fully loaded object. 2012-02-19 18:39:41 +01:00
Regis Houssin
95f9de6ab4 Fix: missing rowid 2012-02-19 18:00:47 +01:00
Laurent Destailleur
104a4532b9 Fix: miscellaneous not initialized vars 2012-02-07 18:48:50 +01:00
Regis Houssin
f0d2823edf Fix: avoid foreach warning 2012-02-06 18:59:07 +01:00
Laurent Destailleur
6cb0685b6f Qual: Uniformize hook names. All hooks to add information on 
create/update/view cards are called fomrObjectOptions instead of
sometine formObjectOptions, sometimes showInputFields, sometimes
showOutputFields.
 2012-02-06 17:18:19 +01:00
Christophe Battarel
6a90298af0 affiche libellé produit dans la langue du client en plus de la description (variable de conf renommée en PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE 2012-01-16 17:12:29 +01:00
Christophe Battarel
5524d42ddb ajout commentaires entete oubliés sur ajout description produit dans la langue du client 2012-01-16 10:35:36 +01:00
Laurent Destailleur
15cd3794c9 Removed comments 2012-01-15 15:16:06 +01:00
Regis Houssin
9fe45c4f4f Fix: uniform code 2012-01-13 17:46:15 +01:00
Christophe Battarel
69c9edbeb3 ajoute la possibilité de visualiser la description des produits dans la langue du client lors de l'jout de lignes dans les commandes/propales/factures 2012-01-13 16:53:28 +01:00
Laurent Destailleur
77870d0557 Add hidden option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS 2012-01-08 23:43:32 +01:00
Laurent Destailleur
8444a290e7 Do not show paypal link if invoice is draft 2011-12-31 14:26:03 +01:00
Laurent Destailleur
43964552bf Add a TODO 2011-12-22 09:07:02 +01:00
Regis Houssin
a5fc434770 Fix: remove unused parameters 
Fix: use dol_clone instead fetch
 2011-12-12 14:04:03 +01:00
Laurent Destailleur
27cd74eaea New: Add hidden option MAIN_LIST_FILTER_ON_DAY 2011-12-08 01:45:38 +01:00
Laurent Destailleur
11727d68b8 Fix: update was not included into pdf generation 2011-12-02 19:57:20 +01:00
Laurent Destailleur
70ab87c210 Qual: Mutualize link to paypal 2011-11-30 19:42:08 +01:00
Laurent Destailleur
f79890b527 New: Add link to paypal payment page 2011-11-30 18:48:37 +01:00
Laurent Destailleur
0080c07c18 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-25 23:36:07 +01:00
Regis Houssin
ad6705977b Fix: XSS injection 2011-11-25 17:35:01 +01:00
Regis Houssin
2ce2c94f5d Fix: XSS injection 2011-11-25 17:12:39 +01:00
Regis Houssin
3fb1db1cf2 Fix: XSS injection 2011-11-25 16:47:57 +01:00
Laurent Destailleur
f36b78444b Add space line 2011-11-23 19:59:23 +01:00