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

46992 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maxime Kohlhaas
ecf1fbe5a7 Typo 2015-04-18 20:03:40 +02:00
Maxime Kohlhaas
c3bcda74f3 Fix : unit price without tax is now subprice (not pu_ht) 2015-04-18 19:17:05 +02:00
Maxime Kohlhaas
2ddef9ffd9 Alert when oustanding amount excedeed 2015-04-18 19:08:44 +02:00
Maxime Kohlhaas
53469c803a Typo 2015-04-18 19:08:01 +02:00
Laurent Destailleur
07bf403354 Merge pull request #2645 from atm-maxime/develop 
Fix : outstanding limit was not saved
 2015-04-18 18:49:53 +02:00
Maxime Kohlhaas
8e4771daa0 Fix : outstanding limit was not saved 2015-04-18 18:48:50 +02:00
Laurent Destailleur
e1403b136c Merge pull request #2639 from aternatik/stable_resource 
New : mark resource module as stable
 2015-04-18 18:48:24 +02:00
Laurent Destailleur
97fe909278 Merge pull request #2642 from GPCsolutions/editorconfig 
Dolibarr uses tab indents
 2015-04-18 18:46:46 +02:00
Laurent Destailleur
3edfbf1a67 Merge pull request #2637 from grandoc/develop 
fix syntax errors
 2015-04-18 18:46:19 +02:00
philippe grand
838329f3d9 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-04-18 18:36:00 +02:00
Raphaël Doursenaud
81a14b5bfd Dolibarr uses tab indents 2015-04-18 18:27:26 +02:00
jfefe
5c4633d538 New : mark resource module as stable 2015-04-18 18:18:21 +02:00
Laurent Destailleur
08dfcf3afc Merge 2015-04-18 18:14:55 +02:00
jfefe
f2e19f2326 Fix: error when deleting resource 2015-04-18 18:07:59 +02:00
philippe grand
eaf0fda6aa fix syntax errors 2015-04-18 18:07:41 +02:00
Laurent Destailleur
ca05c9a26f Fix PHPCS 2015-04-18 18:07:36 +02:00
Laurent Destailleur
873899a5d4 Merge pull request #2635 from FHenry/develop 
fix typo
 2015-04-18 17:45:25 +02:00
Laurent Destailleur
e7505e49cf Merge pull request #2623 from GPCsolutions/pear_mail_mime 
Update PEAR Mail_MIME to 1.8.9
 2015-04-18 17:44:30 +02:00
Laurent Destailleur
471a5857d2 Fix CSS 2015-04-18 17:42:24 +02:00
Florian HENRY
b7191a541c All send email card works with model choice box 2015-04-18 17:15:36 +02:00
Laurent Destailleur
69b9de08b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-18 16:54:20 +02:00
Laurent Destailleur
ce81f58986 Fix several bugs into edit of supplier lines 2015-04-18 16:54:00 +02:00
Florian HENRY
cc887ceff3 fix typo 2015-04-18 16:45:45 +02:00
Laurent Destailleur
a5ba7c664e Merge pull request #2627 from FHenry/develop 
NEW : Email template choose on thirdparty card
 2015-04-18 15:24:46 +02:00
Laurent Destailleur
8cd22ae6c8 Merge pull request #2631 from fappels/develop 
FIX lang
 2015-04-18 15:11:50 +02:00
Marcos García de La Fuente
d6a2d972a6 Fix: [ bug #2601 ] Supplier orderstoinvoice does not work with PostgreSQL 2015-04-18 15:07:19 +02:00
Laurent Destailleur
246c8a01a6 Merge pull request #2611 from defrance69/patch-58 
Update paiement.class.php
 2015-04-18 15:05:16 +02:00
jfefe
fe01c4470d Show tools menu when activating resource module 2015-04-18 15:04:44 +02:00
Marcos García de La Fuente
401c0584e5 Fix: [ bug #2598 ] Untranslated "Supplier" tab name and some tax inputs in /fourn/card.php 2015-04-18 14:59:19 +02:00
Juanjo Menent
f8a1bf9a10 Merge pull request #2621 from atm-maxime/develop 
Remove debug trace
 2015-04-18 14:49:23 +02:00
Juanjo Menent
2f8ed32f76 Fix: Issues if strict mode option ONLY_FULL_GROUP_BY is activated 2015-04-18 14:17:00 +02:00
Juanjo Menent
d3f24dab0a Fix: Issues if strict mode option ONLY_FULL_GROUP_BY is activated 2015-04-18 13:36:47 +02:00
Florian HENRY
d3592c8d58 typo 2015-04-18 13:09:35 +02:00
Francis Appels
d6fc0aa7b5 FIX lang 2015-04-18 11:42:38 +02:00
Juanjo Menent
dc74302985 Fix: Issues if strict mode option ONLY_FULL_GROUP_BY is activated 2015-04-18 11:32:01 +02:00
Florian HENRY
6391fd0c40 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-18 11:07:07 +02:00
Florian HENRY
3d8a7ee179 Start email template selector 2015-04-18 11:06:53 +02:00
Maxime Kohlhaas
1fa43379c9 Merge branch 'develop' of github.com:atm-maxime/dolibarr into develop 2015-04-18 10:43:11 +02:00
Maxime Kohlhaas
7aba52c810 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2015-04-18 10:29:43 +02:00
Raphaël Doursenaud
e8332cc724 Update PEAR Mail_MIME to 1.8.9 
This is nusoap dependency and the unkown previous version
was GPL incompatible and used deprecated functions.
 2015-04-18 04:27:15 +02:00
Laurent Destailleur
deb62f1ffd Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/expedition/list.php
 2015-04-18 04:18:59 +02:00
Maxime Kohlhaas
07fd6a3ae7 Fix : delivery date was not a datetime 2015-04-18 04:18:40 +02:00
Maxime Kohlhaas
e6c5b234fc Remove debug trace 2015-04-18 03:54:33 +02:00
Laurent Destailleur
aab9b0ec60 Merge pull request #2620 from atm-maxime/develop_cat_multiselect 
New : categories as multi-select on product
 2015-04-18 03:53:05 +02:00
Laurent Destailleur
6de4292ccf Merge pull request #2619 from atm-maxime/develop 
NEW shipment lists by status
 2015-04-18 03:51:11 +02:00
Laurent Destailleur
49977f8b87 Merge pull request #2618 from atm-maxime/3.7 
Fix : shipment list sql request and delivery display
 2015-04-18 03:41:51 +02:00
Laurent Destailleur
904eeddf8d git push origin developMerge branch 'novalore-develop' into develop 2015-04-18 03:38:00 +02:00
Laurent Destailleur
f17a6cbe7e Merge branch 'develop' of https://github.com/novalore/dolibarr into 
novalore-develop

Conflicts:
	htdocs/langs/en_US/trips.lang
 2015-04-18 03:37:18 +02:00
Maxime Kohlhaas
9d8036e5a7 New : categories as multi-select on product 2015-04-18 03:12:42 +02:00
Maxime Kohlhaas
8db50e4606 Fix : menu for product batch 2015-04-18 01:39:41 +02:00