Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 12:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
52,830 Commits 36 Branches 190 Tags
30aea901b8f83d4563c864abb841a3e4f7ce9e83
Commit Graph

3022 Commits

Author SHA1 Message Date
aspangaro
cbfa90abca Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-04 20:57:05 +01:00
Laurent Destailleur
504a9a92a4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-11-04 17:42:22 +01:00
Laurent Destailleur
5656773430 Update doc 2014-11-04 17:42:01 +01:00
Laurent Destailleur
e296e52531 Merge pull request #2002 from Devensys/develop-FixErrorinSQLsociete 
Develop fix errorin sq societe
 2014-11-04 17:35:39 +01:00
Laurent Destailleur
899fecb484 Some maintenance sqls 2014-11-04 16:40:01 +01:00
Andrelec1
c9c499717b Fix bad comma 2014-11-04 14:56:18 +01:00
Andrelec1
6837ff730b Fix missing comma 2014-11-04 14:41:56 +01:00
aspangaro
25433120e6 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-04 06:16:03 +01:00
Laurent Destailleur
cf6a0df3e4 A lot of fix in missing intervention trigger. Align key to use same name 
to avoid future bugs.
 2014-11-03 17:23:02 +01:00
Laurent Destailleur
155452ba91 Fix: Proposal deadlock situation 
New: Add missing trigger PROPAL_CLASSIFYBILLED.
 2014-11-03 16:20:55 +01:00
Laurent Destailleur
a1a10edc30 Merge pull request #1987 from IonAgorria/soap-client-order 
Added SOAP client for creating a client order in remote webservice
 2014-11-01 21:14:19 +01:00
Ion Agorria
82aa8458bf Added ws url/key to thirdparty SQL table, class and info page 2014-10-31 17:46:11 +01:00
Laurent Destailleur
9c51effe5c Ajout plus d'info dans description audit. 2014-10-31 15:42:35 +01:00
aspangaro
57f49ec5d4 GPLv3 2014-10-30 20:41:08 +01:00
Laurent Destailleur
fb4858a5d3 Update changelog 2014-10-30 18:07:09 +01:00
Laurent Destailleur
9d9a1e0701 Merge pull request #1974 from grandoc/develop 
encrease name length for societe
 2014-10-30 18:04:38 +01:00
Laurent Destailleur
38a939771c New: Add template of emails into dictionnary. 2014-10-30 17:16:51 +01:00
Laurent Destailleur
a1a03a8061 New: Module notification has been enhanced: 
EMail use now language of target contact.
Can also define a fixed email for notifications.
Better error management
 2014-10-25 01:20:59 +02:00
Philippe GRAND
19e194dd81 encrease name length for societe 2014-10-23 12:01:15 +02:00
Laurent Destailleur
0fba70d4d1 Fix: Triggers sending email for intervention and classify billed 2014-10-20 11:35:34 +02:00
Laurent Destailleur
718b3b19b4 Fix: user and date modification not updated 2014-10-20 11:16:51 +02:00
Laurent Destailleur
e53c328767 Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into 
aspangaro-develop-favorite

Conflicts:
	ChangeLog
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-10-18 15:45:44 +02:00
aspangaro
9f6a460d42 Merge remote-tracking branch 'Upstream/develop' into develop-favorite 
Resolve conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-10-18 15:32:50 +02:00
Maxime Kohlhaas
737cafef4e Merge branch 'develop' of github.com:Dolibarr/dolibarr into mkoevols 2014-10-15 15:02:36 +02:00
Regis Houssin
a1210da513 Fix: missing entity in unique index 2014-10-14 20:19:02 +02:00
Maxime Kohlhaas
452636b0e4 New : Add option to allow extrafield to be modified regardless of the document status 2014-10-14 15:27:40 +02:00
aspangaro
861583bb77 Merge remote-tracking branch 'Upstream/develop' into develop-favorite 2014-10-14 06:12:46 +02:00
Laurent Destailleur
2cf21f856c Fix: table name differs. 2014-10-14 01:47:31 +02:00
Laurent Destailleur
f498921715 Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into 
GPCsolutions-droposcommerce

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/vi_VN/admin.lang
	htdocs/langs/vi_VN/shop.lang
 2014-10-13 00:50:51 +02:00
aspangaro
dc6817813e Merge remote-tracking branch 'Upstream/develop' into develop-favorite 2014-10-12 20:23:08 +02:00
Laurent Destailleur
3bac7c9e11 Add index on new table llx_c_email_template 2014-10-12 16:31:56 +02:00
aspangaro
71dafac03c Add favorite button into country dictionary to put value on top select list 2014-10-12 15:28:01 +02:00
Laurent Destailleur
44e2cd2194 Prepare code to manage task_datehour with task_date. 2014-10-12 01:20:03 +02:00
Laurent Destailleur
00fd9acf31 Fix: Bad length of field 
Transifex sync
 2014-10-09 18:32:23 +02:00
Laurent Destailleur
e76b5a370d Fix: bad parameter 2014-10-09 17:27:14 +02:00
Laurent Destailleur
0390085f54 Style for install match css of login. 2014-10-09 13:47:40 +02:00
aspangaro
c1db82a791 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-10-04 08:10:12 +02:00
Laurent Destailleur
e70aebf2c7 Merge pull request #1937 from fappels/develop 
Expedition lines from same orderline merged.
 2014-10-04 00:58:19 +02:00
Laurent Destailleur
d9f898ab8c Merge pull request #1916 from FHenry/develop 
Add feature to order to invoice on supplier part
 2014-10-04 00:31:11 +02:00
Francis Appels
269df77873 Fix migration sql for inserting accounting records 
Migration SQL could not insert accounting records because datec was set
to NOT NULL
 2014-10-03 12:59:33 +02:00
Laurent Destailleur
8bc57e38d1 Uniformize, support, install and login page with a more neutral 
background (nearest bootstrap). Remove image background.
 2014-10-03 01:48:14 +02:00
aspangaro
f70e8b766f Merge remote-tracking branch 'Upstream/develop' into develop-loan 
Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-09-29 20:40:53 +02:00
aspangaro
d3252d1348 Update 2014-09-29 20:37:51 +02:00
Raphaël Doursenaud
f01e76f686 Removed unmaintaned OScommerce module 2014-09-29 15:22:48 +02:00
Florian HENRY
ce145cc056 Add cache excel export on harddrive with 
MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR const. It can avoid lot's of stack
overflow on large excel export
 2014-09-29 10:16:48 +02:00
Regis Houssin
f233d4f610 New: add doc models management in contract module 2014-09-28 20:39:02 +02:00
aspangaro
250b57ca0a Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-09-28 14:00:26 +02:00
Laurent Destailleur
c2cbbffd12 Fix: duplicate field 2014-09-24 17:30:49 +02:00
Florian HENRY
14ca936cfc set ref_supplier for contract field 2014-09-24 10:21:26 +02:00
Laurent Destailleur
40c1b02a6c Correction repair.sql 2014-09-24 01:15:34 +02:00