lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,164 Commits 43 Branches 150 Tags 886 MiB
315e2e4c13
Commit Graph

39164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
315e2e4c13 Merge branch 'patch-14' of https://github.com/defrance69/dolibarr into 
defrance69-patch-14

Conflicts:
	htdocs/install/mysql/migration/3.4.0-3.5.0.sql
 2013-10-20 14:12:56 +02:00
Laurent Destailleur
305ca25267 New: Add menu entry to page massstockmove.php 2013-10-20 14:05:51 +02:00
Laurent Destailleur
1075806282 Sync from transifex 2013-10-19 18:26:14 +02:00
Laurent Destailleur
8e2cd3d45b Fix: font file for chinese 2013-10-19 17:17:07 +02:00
Laurent Destailleur
586062a911 Fix: syntax error 2013-10-19 15:34:18 +02:00
Laurent Destailleur
c02a0cbb95 Conflict betwen ' and " 2013-10-19 15:31:08 +02:00
Laurent Destailleur
0707409684 Another syntax error 2013-10-19 15:28:58 +02:00
Laurent Destailleur
9e0a779989 Syntax error 2013-10-19 15:27:09 +02:00
Laurent Destailleur
d7020c6f50 Build php ini according to PHP version 2013-10-19 15:25:12 +02:00
Laurent Destailleur
c244992abd Add php version info into travis output 2013-10-19 15:22:51 +02:00
Laurent Destailleur
9c3e794f24 Merge remote-tracking branch 'origin/3.4' into develop 2013-10-19 15:05:04 +02:00
Laurent Destailleur
db9a329c1d Remove PHP 5.2 from travis. Travis not ready for this. 2013-10-19 15:04:54 +02:00
Laurent Destailleur
24cd2d2b85 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-10-19 14:59:46 +02:00
Laurent Destailleur
4f39632937 Add more PHP versions into travis CI 2013-10-19 14:39:12 +02:00
Laurent Destailleur
f87afaac10 Suggest a better page name 2013-10-19 14:38:49 +02:00
Laurent Destailleur
8e42a6fd15 Avoid email when travis is ok 2013-10-19 14:11:56 +02:00
Laurent Destailleur
73263d4328 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-10-19 00:34:00 +02:00
Laurent Destailleur
af521ec070 Trans: Missing translation for accountancy module 2013-10-19 00:33:37 +02:00
Laurent Destailleur
16b2741834 New: Finished page to make mass stock movement 2013-10-18 19:23:27 +02:00
Laurent Destailleur
cb510f7c46 Fix: Travis 2013-10-18 18:51:53 +02:00
Laurent Destailleur
c9012b498f Fix: Code comment and phpunit test 2013-10-18 17:34:12 +02:00
Laurent Destailleur
12366410e5 Merge remote-tracking branch 'origin/3.4' into develop 2013-10-18 17:30:14 +02:00
Laurent Destailleur
4e637d3121 Fix: Sanitizing PHP_SELF 2013-10-18 17:27:17 +02:00
Laurent Destailleur
df930d08b2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-10-18 14:03:35 +02:00
Laurent Destailleur
2f1340a6c6 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/societe/class/societe.class.php
 2013-10-18 12:19:12 +02:00
Laurent Destailleur
5e35731693 Add debug info to find a bug 2013-10-18 11:41:37 +02:00
Laurent Destailleur
d9106b6e85 Add debug info to find a bug 2013-10-18 11:19:32 +02:00
Laurent Destailleur
33b4c9fad7 Fix: Bug into xcal decode 2013-10-18 10:38:59 +02:00
Laurent Destailleur
f0ee706055 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-10-18 10:17:31 +02:00
Laurent Destailleur
e5bc7d29d0 Fix: Validation of contract lose the new ref into trigger. 
Fix: Validation of contract was not using transaction
Fix: Validation of contract did not renamed uploaded directory.
 2013-10-18 10:17:06 +02:00
Laurent Destailleur
bf3ca7a0f0 Fix: Avoid syntax error 2013-10-18 01:20:25 +02:00
Laurent Destailleur
7b53ad5580 Fix: Missing field required by update_price 2013-10-18 01:09:41 +02:00
Laurent Destailleur
bd06ee1abe Prototyping for other table outputs (div or datatable) 2013-10-17 18:37:08 +02:00
Laurent Destailleur
a8f784083c Show ref with label on bank account. 2013-10-16 19:00:00 +02:00
Laurent Destailleur
94c376bf37 Fix: Edit payment date 2013-10-16 17:55:15 +02:00
Laurent Destailleur
9bc0f54ae8 Fix: set of country 2013-10-15 20:51:44 +02:00
Laurent Destailleur
cb889c525c Fix: filter on type of event was lost 2013-10-15 16:42:19 +02:00
Laurent Destailleur
751ef3ff1b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-10-15 15:21:56 +02:00
Laurent Destailleur
fa1e56b976 Code comment 2013-10-15 15:17:33 +02:00
Laurent Destailleur
1a1f7bb600 Merge pull request #1255 from fappels/develop 
fix on product and mouvementstock classes
 2013-10-15 03:06:32 -07:00
Francis Appels
d7fc0eea43 fix: _create() 
add 'require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';'
to htdocs/product/stock/class/mouvementstock.class.php _create method.
This to support product class instance used in function.
 2013-10-15 11:12:41 +02:00
Francis Appels
dde9a6da39 fix: delete() 
The delete method does not delete product_stock record.
Typing error in delete product record debug log, sql iso sqlz
 2013-10-15 11:11:42 +02:00
Laurent Destailleur
5b7b15ecfa Merge pull request #1254 from atm-maxime/develop 
Fix : object origin was fetched instead of shipment => errors when creat...
 2013-10-14 11:18:24 -07:00
Maxime Kohlhaas
9d821d3967 Fix : object origin was fetched instead of shipment => errors when creating shipment 2013-10-14 17:56:23 +02:00
Laurent Destailleur
07d04b7905 Fix: syntax error 2013-10-14 16:12:07 +02:00
Laurent Destailleur
61b98275f5 Fix: Error message 2013-10-14 16:01:01 +02:00
Laurent Destailleur
0d36329336 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-10-14 15:56:42 +02:00
Laurent Destailleur
4dcec72362 Merge pull request #1253 from atm-maxime/develop 
Qual : duplicate code
 2013-10-14 02:39:07 -07:00
Maxime Kohlhaas
0994184bf9 Fix invoice fetch on payment page 2013-10-14 09:45:32 +02:00
Maxime Kohlhaas
387e0ab50b Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2013-10-14 09:42:10 +02:00