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

35490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Laurent Destailleur
9bced140e6 More explanation onto the php session parameter. 2013-03-06 00:45:43 +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
faf1f440e4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-05 15:51:57 +01:00
Laurent Destailleur
c11f7dfc71 Next step for rewriting menu managers. 2013-03-05 15:42:26 +01:00
Laurent Destailleur
52c0044fca Merge pull request #713 from atm-maxime/develop 
LDAP2Dolibarr sync script final
 2013-03-05 05:09:24 -08:00
Maxime Kohlhaas
b2c09e9be4 LDAP2Dolibarr sync script final. Now with scripts sync users and sync groups, all groups and users from LDAP are synced in Dolibarr. To be tested and improved on another LDAP than Active Directory 2013-03-05 13:39:14 +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
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
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
Laurent Destailleur
9a9c9b1083 Merge pull request #711 from FHenry/develop 
[ task #743 ] GED : Add aministration option to disabled autotree to
 2013-03-04 08:11:54 -08:00
Laurent Destailleur
c0d2ee19f5 Merge pull request #712 from FHenry/3.3 
Fix [ bug #747 ]
 2013-03-04 08:02:58 -08: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