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

30722 Commits

Author SHA1 Message Date
Laurent Destailleur
00f4e6ad85 Fix: Force format text of excel text fields 2013-03-09 16:58:55 +01:00
Laurent Destailleur
2c95b55682 Fix: Rename of fields 2013-03-09 16:37:50 +01:00
Laurent Destailleur
418eeef8b4 Fix: Ton of bugs into renaming fields 2013-03-09 16:19:15 +01:00
Laurent Destailleur
0f1741a06b New: hooks for pdf_writelinedesc now implement the rule to overwrite or 
not default code (http://wiki.dolibarr.org/index.php/Hooks_system)
 2013-03-09 15:05:09 +01:00
Laurent Destailleur
01b2a6a79b Prepare database for more localtax types. 2013-03-09 13:12:20 +01:00
Laurent Destailleur
72749bfc5f Merge pull request #721 from frederic34/develop 
Print IPP
 2013-03-08 08:31:15 -08:00
Laurent Destailleur
0fe91796ef New: [ task #696 ] Remove "new stdClass();" when possible 2013-03-08 15:52:23 +01:00
frederic34
18ff2fd198 Merge remote-tracking branch 'upstream/develop' into develop 2013-03-08 13:30:44 +01:00
Laurent Destailleur
e5f712fe14 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-08 12:09:49 +01:00
Laurent Destailleur
2a67af3c94 New: when adding an action, we can define a free code to tag it for 
a specific need.
 2013-03-08 12:04:01 +01:00
frederic34
89399121ba Print IPP printing in "Fiche Commande" 2013-03-08 12:00:16 +01:00
frederic34
135de9ecdb Print IPP 2013-03-08 11:54:32 +01:00
frederic34
2e03169acd Print IPP icon display in formfile 2013-03-08 11:47:48 +01:00
frederic34
cdb1242bb5 Print IPP fix and printer icon 2013-03-08 11:38:30 +01:00
frederic34
16c5427366 Print IPP 2013-03-08 11:26:05 +01:00
frederic34
717ba46a5f Print IPP lib 2013-03-08 11:17:46 +01:00
Laurent Destailleur
a6ce7bb428 Fix: Regression for negative proposal lines. 
Conflicts:
	htdocs/comm/propal.php
 2013-03-08 10:28:25 +01:00
Laurent Destailleur
ffa2c2fb58 Oops, bad fix 2013-03-08 10:22:30 +01:00
Laurent Destailleur
f041a8a95e Fix: Regression for negative proposal lines. 2013-03-08 10:06:23 +01:00
Laurent Destailleur
1e5c56642c Fix: Some regression after renaming state and lastname. 2013-03-08 02:49:42 +01:00
Laurent Destailleur
c86f3ef4b4 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/commande/fiche.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2013-03-08 01:57:32 +01:00
Laurent Destailleur
44698fcde0 Fix: dol_is_dir may not be loaded, so call fails 2013-03-08 01:53:41 +01:00
Laurent Destailleur
b43fffafa9 Fix: Regression after renaming of fields 2013-03-08 01:31:45 +01:00
Laurent Destailleur
63e1b724cb Merge pull request #718 from FHenry/3.3 
Fix [ bug #753 ] cashdesk : Error message when adding product to basket
 2013-03-07 14:24:13 -08:00
Laurent Destailleur
710585d4c2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-03-07 22:40:12 +01:00
Laurent Destailleur
6cac84b222 Fix: Some fixes into reconciliate page 2013-03-07 22:39:57 +01:00
Laurent Destailleur
f62045e770 Merge pull request #720 from simnandez/develop 
[ task #707 ] Create option ProfIdx are mandatory to validate a invoice
 2013-03-07 10:58:13 -08:00
Laurent Destailleur
b060e5961b Qual: Another step in men manager rewrite. 2013-03-07 19:47:03 +01:00
Laurent Destailleur
e97ca67c4a Fix: Several problem with localtax into PDF generation 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
 2013-03-07 19:13:50 +01:00
Laurent Destailleur
668249a195 Fix: We must refresh object also if option MAIN_DISABLE_PDF_AUTOUPDATE 
is 1 (Cyril ZEKSER)
 2013-03-07 18:44:25 +01:00
simnandez
0c8d3336c2 [ task #707 ] Create option ProfIdx are mandatory to validate a invoice 2013-03-07 18:41:56 +01:00
Laurent Destailleur
c762c93eb1 Fix: Several problem with localtax into PDF generation 2013-03-07 12:04:12 +01:00
Laurent Destailleur
a0803e758e Fix: Missing generic translation 2013-03-07 11:25:14 +01:00
Laurent Destailleur
3defd294cb Merge remote-tracking branch 'origin/3.3' into develop 2013-03-07 11:08:15 +01:00
Laurent Destailleur
a3244a4b47 Fix: Missing genereic translation 2013-03-07 11:05:20 +01:00
fhenry
25fa2254c1 Fix [ bug #753 ] cashdesk : Error message when adding product to basket 
https://doliforge.org/tracker/?func=detail&aid=753&group_id=144
http://www.dolibarr.fr/forum/526-autres-modules/39315-probleme-avec-point-de-vente
http://www.dolibarr.es/index.php/foro/6-icomo/2080-errores-con-tpv-y-tipos-de-iva
 2013-03-07 10:50:02 +01:00
Laurent Destailleur
47ec826c17 New: Add link to check professional id for india. 2013-03-07 10:47:05 +01:00
jfefe
fcd81e47eb Use price2num() function instead of price() to use calcul in ODT. 
Libre/Open Office wants number with dot and no space to allow make calcul in ODT document
 2013-03-07 03:43:23 +01:00
jfefe
289e2e7888 New function to fill ODT substitution array with extrafield of object 2013-03-07 03:27:28 +01:00
jfefe
65ed01a251 Extrafields on ODT (propal) : fix value of price with currency & display date with correct format 2013-03-07 03:27:20 +01:00
jfefe
ac3116930c Add value to store price type extrafield without currency in ODT 2013-03-07 03:27:08 +01:00
jfefe
06807ce198 Fix : select correct value of extrafield (select list) 2013-03-07 02:13:21 +01:00
jfefe
1690c77aa2 Merge branch 'extra_invoice' into extrafields 
Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-03-07 01:48:27 +01:00
eldy
6c2841d4d6 New: Type of fields are received by export format handlers 2013-03-06 22:28:15 +01:00
eldy
9d047d740b Fix: no null into not null field 2013-03-06 21:30:37 +01:00
eldy
e74b07cbff Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-03-06 21:28:50 +01:00
eldy
9b8dd94751 Fix: no null into not null field 2013-03-06 21:26:05 +01:00
eldy
05c6706727 Fix: error with pgsql 2013-03-06 20:08:38 +01:00
Laurent Destailleur
1f0dbc698c Merge pull request #714 from FHenry/3.3 
fix [ bug #749 ]
 2013-03-06 10:33:51 -08:00
Laurent Destailleur
b9bb0f9857 Merge pull request #716 from grandoc/develop 
fix : deprecated
 2013-03-06 10:30:58 -08:00
Laurent Destailleur
cdc355fea0 Fix: Missing hookmanager 2013-03-06 17:21:51 +01:00
Grand Philippe
a080021511 fix : deprecated 2013-03-06 17:17:34 +01:00
Laurent Destailleur
baf6ccf654 New: Can define of we want to use VAT or not for subscriptions 
(foundation module).
New: Can define a default choice for choice "More action when
recording a subscription" (foundation module).
 2013-03-06 17:16:26 +01:00
Grand Philippe
b6581c2b26 fix : deprecated 2013-03-06 16:38:15 +01:00
Laurent Destailleur
0fc17069c8 Translation 2013-03-06 16:11:20 +01:00
Laurent Destailleur
d92fd0eaed New: Add table, dictionnary and option to enable "revenue stamp". 2013-03-06 16:09:00 +01:00
Laurent Destailleur
0bfa968a3f New: Add field to store revenue stamp 2013-03-06 15:44:06 +01:00
Laurent Destailleur
b56723d600 Fix: Avoid wrapping 2013-03-06 10:06:54 +01:00
jfefe
04617d0eb3 Show extrafields for object into invoice ODT document 2013-03-06 05:33:00 +01:00
jfefe
dc1314f4f4 Retreive extrafield when fetch invoice 2013-03-06 05:31:19 +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
jfefe
4314d4c7fe Add admin screen for extrafields on customer invoices 2013-03-06 03:50:41 +01:00
jfefe
88a042ec41 Prepare invoice admin page to add extrafield support 2013-03-06 03:36:43 +01:00
jfefe
49f1ef173a Add table for invoice extrafields 2013-03-06 03:17:38 +01:00
jfefe
7d3c35fb90 Merge branch 'extra_propal' into extrafields 2013-03-06 01:41:47 +01:00
jfefe
8b749eaafc Fix : extrafields are not saved on update (propale) 2013-03-06 01:34:32 +01:00
jfefe
61127e82f6 User must have write permission to edit extrafields on propale 2013-03-06 01:33:55 +01:00
Laurent Destailleur
9bced140e6 More explanation onto the php session parameter. 2013-03-06 00:45:43 +01:00
jfefe
9eee5f9509 Fix : extrafields for propale were note saved after creation 2013-03-06 00:18:41 +01:00
jfefe
9877466594 Add information about linked proposal into basic ODT template for invoice 2013-03-06 00:03:24 +01:00
jfefe
55bfdd341d Fix : change to variable with unused name 2013-03-05 23:51:42 +01:00
jfefe
bd229a9417 Add param to define key name in return array of substitution function 
for propal
 2013-03-05 22:23:57 +01:00
jfefe
3cefb62621 Fix : incorrect function used to retrieve extrafields for propal 2013-03-05 22:22:10 +01:00
jfefe
9e612696f2 Add help about extrafields in ODT propal 2013-03-05 21:51:33 +01:00
fhenry
617a71478b fix [ bug #749 ] 2013-03-05 19:05:12 +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
Laurent Destailleur
d5822b7fbd Fix: Syntax sql error when adding/editing line of contract and when 
company does not use vat.
 2013-03-05 18:13:27 +01:00
Laurent Destailleur
c11f7dfc71 Next step for rewriting menu managers. 2013-03-05 15:42:26 +01:00
jfefe
5ce11d00dd Display linked propal information into invoice ODT 2013-03-05 15:11:51 +01:00
Laurent Destailleur
de6d40237d Fix: No syntax error when when want no limit 2013-03-05 13:28:31 +01:00
Laurent Destailleur
ae2355fda5 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-03-05 12:54:37 +01:00
JF FERRY
ff2a851ae8 Move substitution function for propal to common class & add extrafields display 2013-03-05 08:38:41 +01:00
Laurent Destailleur
215731dc59 Fix bug 2013-03-05 00:14:04 +01:00
Laurent Destailleur
b036120c70 Labels 2013-03-04 23:56:17 +01:00
Laurent Destailleur
555b3a1199 Fix:; Removed warning 2013-03-04 21:00:22 +01:00
jfefe
59627408c0 Edit extrafields on propal 2013-03-04 19:17:11 +01:00
jfefe
f335c4f306 New : add extrafield support on propal object 2013-03-04 18:22:25 +01:00
Laurent Destailleur
f86cad0580 Fix: Try a fix for IE9 (need to be tested with IE 8, 7 and 10) 2013-03-04 17:36:20 +01:00
fhenry
c29602382d Taking account remark on pull request da17302 2013-03-04 16:59:39 +01:00
fhenry
f793ed83f6 Fix [ bug #747 ] 2013-03-04 15:36:40 +01:00
fhenry
da17302349 [ task #743 ] GED : Add aministration option to disabled autotree to 
display
 2013-03-04 11:16:46 +01:00
Laurent Destailleur
ae1e0dff87 Merge pull request #710 from FHenry/3.3 
Fix [ bug #742 ]
 2013-03-03 15:26:50 -08:00
Laurent Destailleur
931b556b69 Fix: sql error 2013-03-04 00:01:38 +01:00
fhenry
b0212fc8e6 Fix [ bug #742 ] 
and translation of constant description
 2013-03-03 21:23:18 +01:00
Laurent Destailleur
737752e36c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2013-03-03 00:10:36 +01:00
Laurent Destailleur
248c75a7b2 Look: Minor fix 2013-03-03 00:00:38 +01:00
simnandez
a811121daf [ task #731 ] Uniformize ref generation 2013-03-02 16:50:36 +01:00
Laurent Destailleur
fc46a02573 Fix: Uniformize field type 2013-03-02 16:39:26 +01:00
Laurent Destailleur
51d23d7c48 Merge fix of 3.3 2013-03-02 16:17:12 +01:00
Laurent Destailleur
924d01249c Prepare 3.3.1 maintenance release 2013-03-02 16:12:06 +01:00
Laurent Destailleur
6f51925c7b Merge pull request #708 from simnandez/develop 
[ task #731 ] Uniformize ref generation. Propals
 2013-03-02 07:06:53 -08:00
Laurent Destailleur
0f576181be Merge pull request #707 from simnandez/3.3 
Fix: Localtax2 for Spain must be based into buyer
 2013-03-02 07:05:50 -08:00
Laurent Destailleur
862c56a118 Merge pull request #704 from GPCsolutions/develop-noutf8bom_includes 
Removed UTF-8 BOM from included libraries
 2013-03-02 07:05:13 -08:00
Laurent Destailleur
6b3b2ea1c7 Merge pull request #706 from atm-maxime/develop 
Bug on contact list
 2013-03-02 07:04:41 -08:00
Laurent Destailleur
81a06507fa Fix: data not refreshed 2013-03-02 16:01:46 +01:00
simnandez
7d9d575e40 [ task #731 ] Uniformize ref generation. Propals 2013-03-02 15:57:26 +01:00
Laurent Destailleur
f172c900c7 Qual: Uniformize menu code 2013-03-02 14:43:36 +01:00
Laurent Destailleur
f464b7b37c Fix: Avoid using date_format 2013-03-01 23:30:07 +01:00
Laurent Destailleur
5fb4ec7891 Fix: bad field name 2013-03-01 23:14:28 +01:00
simnandez
0cb5b3f50c Fix: Localtax2 for Spain must be based into buyer 2013-03-01 20:32:49 +01:00
Laurent Destailleur
e6afcd328c Look: Minor fix in CSS for IE. 2013-03-01 19:39:54 +01:00
Laurent Destailleur
911c25c3fd Qual: Better error management 2013-03-01 19:25:49 +01:00
Maxime Kohlhaas
da87828200 Fix bug # 740 : address copy 2013-03-01 18:41:41 +01:00
Maxime Kohlhaas
803bee076c Engish standardization correction + search by idprof1 possible 2013-03-01 18:20:42 +01:00
Laurent Destailleur
3022dff108 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-01 18:14:42 +01:00
Maxime Kohlhaas
881b3bc936 Bug fix on contact list due to name column renamed 2013-03-01 18:11:34 +01:00
Laurent Destailleur
562ea22304 Qual: Better error management 2013-03-01 18:10:19 +01:00
Laurent Destailleur
29ccc749ae Merge pull request #703 from GPCsolutions/develop-noutf8bom_main 
Removed UTF-8 BOM
 2013-03-01 07:23:17 -08:00
Raphaël Doursenaud
a6407a3642 Removed UTF-8 BOM from included libraries 2013-03-01 14:17:36 +01:00
Raphaël Doursenaud
e76ffca9ba Removed UTF-8 BOM 2013-03-01 14:11:42 +01:00
Laurent Destailleur
a1b4d670ff Merge pull request #701 from defrance69/patch-14 
Update index.php
 2013-03-01 03:48:54 -08:00
Alexis Algoud
49f712546f Add condition for normal traitment on empty hook result. 
Note : The normal case on 'formObjectOptions' is currently nothing more (no extrafields,...).
 2013-03-01 11:38:24 +01:00
Alexis Algoud
2d36423310 Ajout de la gestion des Hooks (doActions & sur la page d'ajout des commerciaux à une société, /societe/commerciaux.php 2013-03-01 10:42:05 +01:00
BENKE Charles
5ad98a8652 Update index.php 
rename search_product by search_project (the real search thing)
 2013-03-01 00:56:29 +01:00
eldy
4e52b2596a Uniformize code 2013-02-28 23:49:38 +01:00
fhenry
0d0c1e8c14 Fix [ bug #736 ] 2013-02-28 21:18:52 +01:00
fhenry
7952a1f1a5 rool back changes 2013-02-28 21:15:45 +01:00
fhenry
dcf76d7bcb Fix [ bug #736 ] 2013-02-28 21:13:25 +01:00
Regis Houssin
16ad99f8c5 Fix: to force id field name 2013-02-28 19:41:44 +01:00
Regis Houssin
d9b7886ef9 Fix: try to fix regression, stored the last id created in a session 
variable in order to be used to find out information in the "ref_ext" in
order to differentiate automatic actions.
 2013-02-28 18:47:38 +01:00
Laurent Destailleur
1d76b3153e Start to work onto payment return 2013-02-28 17:37:07 +01:00
Laurent Destailleur
7bbbda2dce New: dol_syslog method accept a suffix to use different log files for 
log.
 2013-02-28 16:19:16 +01:00
Laurent Destailleur
fd6b51413c Civility not required in a short label 2013-02-28 15:37:53 +01:00
Laurent Destailleur
33feddcd32 Qual: Rewrite of menu manager. next step. 2013-02-27 21:40:43 +01:00
Laurent Destailleur
b9848702a8 Merge remote-tracking branch 'origin/3.3' into develop 2013-02-27 19:44:22 +01:00
Laurent Destailleur
d190e924b3 Fix: Update of type was not working. 2013-02-27 19:43:40 +01:00
Laurent Destailleur
8b244b0d61 Fix: select lost if error 2013-02-27 19:21:40 +01:00
Laurent Destailleur
47c89dfd8e Fix: trans 2013-02-27 17:47:51 +01:00
Laurent Destailleur
0d94ec4fee Fix: trans 2013-02-27 17:47:21 +01:00
Laurent Destailleur
f2371be191 Fix: Update button does not appear 2013-02-27 15:24:08 +01:00
Laurent Destailleur
f294ea5fb0 Fix: Update button does not appear 2013-02-27 15:23:25 +01:00
Grand Philippe
44683a0e21 english language standardization 2013-02-27 11:58:50 +01:00
Grand Philippe
6fb6b916c7 english language standardization 2013-02-27 11:24:50 +01:00
Laurent Destailleur
283aeb2945 Fix: Add option MAIN_USE_LOCALTAX_TYPE_7 to hide localtax 7 because 
type 7 need to be implemented at invoice level, not line level. This
disable the feature (we need better implementation) without removing it
for people using it in the past.
 2013-02-27 01:06:08 +01:00
Laurent Destailleur
61d5bd9962 css 2013-02-27 01:05:30 +01:00
Laurent Destailleur
029dec126d Fix: Add option MAIN_USE_LOCALTAX_TYPE_7 to hide localtax 7 because 
type 7 need to be implemented at invoice level, not line level. This
disable the feature (we need better implementation) without removing it
for people using it in the past.
 2013-02-27 01:05:16 +01:00
Laurent Destailleur
6f0c35ef61 Fix: Bad migration instruct 2013-02-26 22:57:01 +01:00
Laurent Destailleur
453539511a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-02-26 21:36:18 +01:00
Laurent Destailleur
bdcb6bdef5 Try to aplpy enhancements defined into 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/38958-resolu-probleme-exports#38968
 2013-02-26 20:15:20 +01:00