Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
34,955 Commits 36 Branches 189 Tags
7c4b901b0a7098e74e487fa3837f3d2310723fcd
Commit Graph

3216 Commits

Author SHA1 Message Date
Maxime Kohlhaas
67dbae4486 Correction for new box inclusion 2012-10-09 00:58:07 +02:00
Maxime Kohlhaas
229005b1a9 Task # 186 : Forgot to add the new box in the mod definition... 2012-10-09 00:54:02 +02:00
Maxime Kohlhaas
d343b76f91 Bug # 543 and # 570 : contact address is now used in recipient block and no more display bug on customer order ref until 36 digits 2012-10-09 00:28:52 +02:00
Regis Houssin
478449da37 Fix: convert line delimiters 2012-10-08 20:47:10 +02:00
Regis Houssin
0975918cc6 Fix: [task #146] Remove table llx_categorie_association 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-10-08 19:27:02 +02:00
Christophe Battarel
04be578863 fix wrong last update in cleansep function 2012-10-08 11:32:28 +02:00
Laurent Destailleur
215d7a883e Fix: Revert bugged new feature that show false information. 2012-10-06 23:13:46 +02:00
Laurent Destailleur
6873e93b7f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-05 19:40:09 +02:00
Laurent Destailleur
34f2402cb5 Qual: Removed dead code 2012-10-05 19:39:53 +02:00
Maxime Kohlhaas
85c03faec7 Merge branch 'mko186' into develop 
Conflicts:
	htdocs/langs/en_US/orders.lang
	htdocs/langs/fr_FR/orders.lang
 2012-10-05 08:30:09 +02:00
simnandez
f873198442 Fix: Warning into perms page 2012-10-04 18:40:05 +02:00
simnandez
caef97dc08 Task # 104: Check if module invoice is active and user has creation 
permissions. Move creation invoice to action bar into customer card
 2012-10-04 18:23:21 +02:00
Maxime Kohlhaas
16f82216bf Task # 186 : Add stock column in sql request to get object lines + display alert icon if stock is too low 2012-10-04 16:26:33 +02:00
Laurent Destailleur
5c6b0c064e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-10-04 15:43:28 +02:00
Laurent Destailleur
9ba100a84b New: Support removing tab into member module 2012-10-04 15:37:10 +02:00
Maxime Kohlhaas
0e17c7c063 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko186 2012-10-04 15:36:47 +02:00
Laurent Destailleur
bdb7becbc6 Fix: Try another fix on getTrad bug. 2012-10-04 09:44:04 +02:00
Laurent Destailleur
4b27a9215b Fix: Show message only when needed 2012-10-03 23:15:57 +02:00
Laurent Destailleur
59a33db53d Fix: Add warning to ask refresh. 2012-10-03 20:10:29 +02:00
Laurent Destailleur
2159848490 Fix: getTradFromKey 2012-10-03 17:47:53 +02:00
Laurent Destailleur
2617fc21a6 Some fix: List of invoices to show in "to bill" menu must contains 
"Validated, Shipment in process, Delivered" (some users may want to
make invoice before shipment, some after).
We keep workflow opened by default. Module workflow may restrict this
however.
Also, remove menu entry, because we now have direct link to page onto
list.
 2012-10-03 11:43:39 +02:00
simnandez
921795e562 Task # 104 : Remove MAIN_FEATURES_LEVEL 2012-10-03 09:16:27 +02:00
Regis Houssin
fc1cc95d08 Fix: bad path 2012-10-03 08:54:21 +02:00
Laurent Destailleur
c25e908b75 Doxygen 2012-10-03 00:30:50 +02:00
Maxime Kohlhaas
89e14043a1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko186 2012-10-02 11:01:21 +02:00
Spangaro Alexandre
3ae6117e16 Reintegrate accounting.php in admin 2012-10-02 06:07:57 +02:00
Spangaro Alexandre
3e4fd761a5 Add function to choose chart of accounts 2012-10-02 05:45:49 +02:00
Laurent Destailleur
082ee53dae Fix: Miscellaneous fix in supplier product input 2012-10-02 00:30:23 +02:00
Laurent Destailleur
eec2a7b34e Merge pull request #429 from atm-maxime/mko559 
Task # 559 : add discount on supplier prices
 2012-10-01 13:31:17 -07:00
Maxime Kohlhaas
1aa3156958 Task # 186 : new box of products with stock alert 2012-10-01 16:44:38 +02:00
Maxime Kohlhaas
ed2a140046 Task # 559 : add display of discount in product list while adding line on supplier order 2012-10-01 11:45:28 +02:00
Regis Houssin
bcf46d00f0 Fix: convert line delimiters !! 2012-09-30 21:26:58 +02:00
Regis Houssin
d23188c64a Fix: doxygen 2012-09-30 20:49:13 +02:00
Laurent Destailleur
9db72fb50d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-09-28 16:11:46 +02:00
Laurent Destailleur
e7203fa4f3 New: The discount on line for supplier invoices is now supported 2012-09-28 16:08:44 +02:00
Christophe Battarel
15d7266abf import : add csv options (separator and enclosure) 2012-09-28 10:23:04 +02:00
Laurent Destailleur
6c769cfaf3 Fix: postgresql compatibility 
Qual: Removed deprecated code
 2012-09-27 23:54:47 +02:00
Laurent Destailleur
e94ddde91d Fix: Patch calculation field odt 2012-09-27 21:08:32 +02:00
Laurent Destailleur
a98de7ef02 Fix: No error when hour not provided 2012-09-27 13:25:31 +02:00
Regis Houssin
1919604089 Fix: more compatible with multicompany transverse mode 
Fix: strict mode bubbles
 2012-09-27 11:57:46 +02:00
Laurent Destailleur
051b93c73b Qual: Code cleaner using field name instead of index number. 
New: Can use new syntax to define parent of a menu
(fk_mainmenu=&fk_leftmenu=)
 2012-09-27 00:05:13 +02:00
Regis Houssin
e9de123036 Fix: hide menu if empty 2012-09-26 12:09:14 +02:00
Regis Houssin
d08e66b0b8 Fix: add member module compatibility 2012-09-26 10:43:15 +02:00
Regis Houssin
817e653519 Fix: add todo for free tag treatment 2012-09-25 18:31:08 +02:00
Christophe Battarel
67333522b0 add ability to remove a product tab if it's defined in a module description 2012-09-25 14:42:58 +02:00
Laurent Destailleur
043e5edc2c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-24 21:37:36 +02:00
Laurent Destailleur
7d83fdce5b Fix: Several fixes into date functions 
Qual: Add PHPUnit tests
 2012-09-24 21:37:19 +02:00
Regis Houssin
9792d5a289 Fix: use company name if firstname and lastname not exists 2012-09-24 12:12:37 +02:00
Regis Houssin
c268a62cab Fix: try to disable 1900 test 2012-09-24 09:30:37 +02:00
Laurent Destailleur
a6b2eab439 Revert bad fix. 
Unit tests are back ok (when tag is @6 or @=, yearoffset
is not zero but must not be applied when replacing yyyy). 
Compatibility with 3.2 is also restored.
 2012-09-23 22:09:54 +02:00