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

52750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fappels
c5a9b0e75b Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse 2015-12-18 20:12:26 +01:00
Laurent Destailleur
b47dc8a394 Fix to use new travis setup 2015-12-18 20:10:11 +01:00
fappels
bce7f52f79 merge Dolibarr/develop 2015-12-18 20:05:14 +01:00
Laurent Destailleur
116bdf47a3 Debug travis 2015-12-18 20:02:28 +01:00
Laurent Destailleur
61df71cc64 Fix travis 2015-12-18 19:57:09 +01:00
Laurent Destailleur
11042fe499 Restore data missin help debug 2015-12-18 19:54:54 +01:00
fappels
982db2e01f Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse 2015-12-18 19:31:02 +01:00
Laurent Destailleur
064fad136e Try to solve travis pb 2015-12-18 19:28:17 +01:00
Laurent Destailleur
0dc4130a17 Add debug 2015-12-18 18:59:20 +01:00
Laurent Destailleur
056ab63680 Try to fix travis error using new setup 2015-12-18 18:46:35 +01:00
Laurent Destailleur
480111c6b1 Try to fix travis error using new setup 2015-12-18 18:31:51 +01:00
Laurent Destailleur
5c8731b197 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-12-18 18:29:51 +01:00
Laurent Destailleur
aa7e74f4c8 Try to fix travis error using the new setup 2015-12-18 18:29:33 +01:00
Laurent Destailleur
dc9c5ed5ef Enhance transifex sync 2015-12-18 18:25:09 +01:00
Laurent Destailleur
1b67a9faf1 Merge pull request #4262 from atm-ph/fix_3.8_create_order_from_propal 
FIX label of line is set in description field if empty
 2015-12-18 18:21:20 +01:00
Laurent Destailleur
484dc5937b Fix regression in sorting 2015-12-18 18:05:07 +01:00
fappels
7fc8007571 New add shipping and dispatching from/to multiple warehouses 
Add select2 to warehouse selectors
Ship customer orderline from multiple warehouses
Dispatch client orderline to multiple warehouses
 2015-12-18 18:00:31 +01:00
Laurent Destailleur
43044bbb4f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-18 17:32:54 +01:00
Laurent Destailleur
eaacfabdf6 Merge pull request #4261 from hregis/3.8_bug 
Fix: Disable "main.inc.php" hooks with ajax return
 2015-12-18 17:32:45 +01:00
Laurent Destailleur
4998516835 Code comment 2015-12-18 17:31:50 +01:00
Laurent Destailleur
724817b966 Merge pull request #4259 from aschio/develop_sunimport 
Adding extrafields to shipments module
 2015-12-18 17:28:35 +01:00
Laurent Destailleur
dc8e5f45ae Merge pull request #4254 from grandoc/develop 
[Qual] Uniformize code
 2015-12-18 17:13:22 +01:00
phf
c215898c52 FIX label of line is set in description field if empty 2015-12-18 17:11:14 +01:00
Laurent Destailleur
7af4d91828 Merge pull request #4251 from fmarcet/3.6 
FIX: Not deleting contracts on element_element table
 2015-12-18 17:07:42 +01:00
Laurent Destailleur
c328860af0 Merge pull request #4250 from GPCsolutions/dolibarr-4242 
FIX #4242 Allow disabling dashes in documents
 2015-12-18 17:07:00 +01:00
Laurent Destailleur
452feca64a Merge pull request #4249 from GPCsolutions/3.8-4242 
FIX #4242 Allow disabling dashes in documents
 2015-12-18 17:06:51 +01:00
Laurent Destailleur
2a137cd126 Merge pull request #4248 from GPCsolutions/3.7-4242 
FIX #4242 Allow disabling dashes in documents
 2015-12-18 17:06:40 +01:00
Laurent Destailleur
3d6f1d911a Merge pull request #4247 from GPCsolutions/3.6-4242 
FIX #4242 Allow disabling dashes in documents
 2015-12-18 17:06:23 +01:00
Laurent Destailleur
74293cd7cc git push origin developMerge branch 'GPCsolutions-dolibarr-cifix' into develop 2015-12-18 17:05:19 +01:00
Laurent Destailleur
d0ec3f1152 Merge branch 'dolibarr-cifix' of 
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-dolibarr-cifix

Conflicts:
	htdocs/product/card.php
 2015-12-18 17:05:04 +01:00
Regis Houssin
70354def7c Fix: Disable "main.inc.php" hooks with ajax return 2015-12-18 13:27:51 +01:00
Laurent Destailleur
98cd4f8307 Fix message so it is more clear what the feature can do or not. 
Fix list of email templates must be hidden for templates of disabled
modules.
 2015-12-18 12:48:20 +01:00
cla
cb96618460 Merge branch 'develop' into develop_sunimport 2015-12-18 10:49:57 +01:00
fappels
4fcedc92c9 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2015-12-18 10:29:53 +01:00
BENKE Charlie
dc0af179e9 add icalname on default event 
allow to manipulate it (show/hide) when we add some other calendar on main (eg fichinter calendar)
 2015-12-18 01:41:30 +01:00
Raphaël Doursenaud
b446aef192 FIX #3868 Upgraded ckeditor to 4.5.6 2015-12-17 22:44:47 +01:00
Raphaël Doursenaud
fd2b90ac75 [Qual] Added development tools to composer 2015-12-17 22:44:41 +01:00
Laurent Destailleur
b10f9d4ca3 Fix: when doing an export of extrafields, we must use different table 
alias for each extrafield table.
 2015-12-17 20:40:33 +01:00
Laurent Destailleur
5eea1ce7d9 Fix several warnings 2015-12-17 19:37:24 +01:00
philippe grand
6e45ad92fa fix some issue within setEventMessages attribut 2015-12-17 17:35:30 +01:00
philippe grand
b91031b693 fix some issue within my last commit 2015-12-17 17:20:28 +01:00
Laurent Destailleur
5f4947e3c1 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-12-17 17:16:37 +01:00
Laurent Destailleur
cdc408a84c Fix: button "now" was not working on date using no javascript 2015-12-17 17:16:26 +01:00
philippe grand
367d9de0b7 fix some translation 2015-12-17 17:12:28 +01:00
philippe grand
93845ffa69 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-12-17 16:58:05 +01:00
philippe grand
c9d6607b04 [Qual] Uniformize code 2015-12-17 14:14:44 +01:00
Laurent Destailleur
92343901d6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-17 14:01:34 +01:00
Laurent Destailleur
ba3c8de785 Update doc comment to make things cleaner to avoid confusion between old 
deprecated doActions of canvas and doActions of triggers.
 2015-12-17 14:01:22 +01:00
aspangaro
ea73e0253c Move fiscal year from accountancy module to configuration of Dolibarr 2015-12-17 13:09:46 +01:00
aspangaro
85f87d45df Add select account in product card 2015-12-17 12:57:08 +01:00