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
c6b215d3d0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-12 13:34:45 +01:00
Laurent Destailleur
9c1f70996a Merge pull request #731 from grandoc/3.3 
fix some translations
 2013-03-12 05:27:15 -07:00
Laurent Destailleur
c1ab042ad1 Merge pull request #733 from defrance69/patch-16 
Update sendings.lib.php
 2013-03-12 05:27:02 -07:00
Laurent Destailleur
c215974c8c Add missing vat rate for saudi arabia 2013-03-12 12:20:06 +01:00
Laurent Destailleur
e731d954b3 Translation 2013-03-12 12:00:53 +01:00
Laurent Destailleur
7138c6b0f9 T 2013-03-12 11:59:52 +01:00
simnandez
5c4b537a65 Fix: [ bug #762 ] Bad profit calculation in Reporting 2013-03-12 11:49:15 +01:00
Laurent Destailleur
fe072d992c Fix: WSDL of productorservice was not valid. Normalize field names. 2013-03-12 10:35:24 +01:00
Laurent Destailleur
9527174300 Fix: WSDL of productorservice was not valid. Normalize field names. 2013-03-12 10:31:28 +01:00
Laurent Destailleur
bcf694c255 Qual: Remove deprecated code. 2013-03-12 10:03:19 +01:00
BENKE Charles
425ed19e20 Update sendings.lib.php 
delivery_prepare_head 
complete_head_from_modules object->id 
but the good one is $object->origin_id
so we temporary change it
 2013-03-11 21:01:04 +01:00
Laurent Destailleur
e01a55876b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-03-11 19:06:01 +01:00
Laurent Destailleur
fdbd3bf36b Fix: lastname 2013-03-11 17:41:38 +01:00
Grand Philippe
dd248e9d58 fix : dyslexia 2013-03-11 17:19:03 +01:00
Laurent Destailleur
1df3ad143e Fix: Lastname lost 2013-03-11 17:04:59 +01:00
Laurent Destailleur
0219f11e64 Fix: Missing default value 2013-03-11 17:01:46 +01:00
Laurent Destailleur
e1bf659db5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-11 16:49:37 +01:00
Laurent Destailleur
b0d7b33815 Merge pull request #715 from jfefe/extrafields 
[ task #746 ] add extrafields support on propal object
 2013-03-11 08:44:59 -07:00
Laurent Destailleur
5bc66318c2 New: use dolGetFirstLastname() everywher we should. 2013-03-11 15:54:01 +01:00
Grand Philippe
979a36e941 fix some translations 2013-03-11 15:18:24 +01:00
Laurent Destailleur
34fed3e430 No link if we renamed into another product 2013-03-11 15:06:40 +01:00
Grand Philippe
06e931632d fix some translations 2013-03-11 14:51:48 +01:00
Laurent Destailleur
b4299ad583 Fix: Select of user 2013-03-11 14:51:19 +01:00
Laurent Destailleur
9eae775837 Merge remote-tracking branch 'origin/3.3' into develop 2013-03-11 14:35:08 +01:00
Laurent Destailleur
710ea872a9 Merge pull request #727 from cbattarel/3.3 
fix wrong value name when updating buyingprice
 2013-03-11 06:25:35 -07:00
Laurent Destailleur
633a15f10d Fix: Usage of order into export broken when filters are used 2013-03-11 14:20:08 +01:00
Laurent Destailleur
5eb728ae43 Fix: Usage of order into export broken when filters are used 2013-03-11 14:09:54 +01:00
Grand Philippe
bb71b7ffed fix some translations 2013-03-11 12:00:09 +01:00
Grand Philippe
02adc70667 fix some translations 2013-03-11 11:11:52 +01:00
Laurent Destailleur
6bc280ea7e Test for some terminals 2013-03-11 10:18:25 +01:00
Laurent Destailleur
d8af59756d New: Add function dolGetFirstLastname 2013-03-11 10:11:43 +01:00
Christophe Battarel
f620e6948f fix wrong value name when updating buyingprice 2013-03-11 09:08:57 +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
Laurent Destailleur
42f857676c Update example templates 2013-03-10 16:03:35 +01:00
Laurent Destailleur
02916825a6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-03-10 15:37:29 +01:00
Laurent Destailleur
ae7ae7458a Trans: Update turkish language files 2013-03-10 13:58:49 +01:00
simnandez
f79a26fe65 [ task #731 ] Uniformize ref generation. Interventions 
[ task #748 ] Add a link "Dolibarr" into left menu
 2013-03-10 13:58:32 +01:00
simnandez
92c1732b77 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2013-03-10 13:48:22 +01:00
Laurent Destailleur
64469a1d5c Fix: doxygen 2013-03-10 13:24:08 +01:00
Laurent Destailleur
dbba8fd6ba New: Can force picto path so an external module can use it with its own 
picto
 2013-03-10 13:23:55 +01:00
Laurent Destailleur
9b8a8351b4 Fix: Menu hidden 2013-03-10 13:22:51 +01:00
simnandez
c3f8939ede [ task #748 ] Add a link "Dolibarr" into left menu 2013-03-10 13:11:31 +01:00
simnandez
ca0144d647 Trad: Add missing translations 2013-03-10 12:49:56 +01:00
simnandez
59cd4b7825 Trad: Add missing translations 2013-03-10 12:31:56 +01:00
Laurent Destailleur
746e005726 Fix: Fix ton of regression due to field name change 2013-03-09 20:34:38 +01:00
Laurent Destailleur
60f16e1a88 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-09 19:06:53 +01:00
Laurent Destailleur
3e5ee3b00a Fix: PHPUnit tests are back. 2013-03-09 18:55:57 +01:00
Laurent Destailleur
e03487f865 Merge pull request #724 from KreizIT/develop 
Add trigger BILL_UNVALIDATE when invoice is unvalidate
 2013-03-09 09:55:29 -08:00
Cedric GROSS
d16691c856 Add trigger BILL_UNVALIDATE when invoice is unvalidate 2013-03-09 17:38:35 +01:00
Laurent Destailleur
7bbbc32af9 Fix: Missing style and typo error 2013-03-09 17:08:19 +01:00
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